From bac85624b3bcec693bf5109f90250fe67bde13c2 Mon Sep 17 00:00:00 2001
From: Michael Ficarra <git@michael.ficarra.me>
Date: Sat, 28 Mar 2026 09:49:50 -0600
Subject: [PATCH 01/10] mark early returns in algorithm step <li>s with an
 early-exit class

---
 src/Algorithm.ts                                 | 16 ++++++++++++++++
 .../generated-reference/algorithms.html          |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Algorithm.ts b/src/Algorithm.ts
index 9a5df160..52e1515a 100644
--- a/src/Algorithm.ts
+++ b/src/Algorithm.ts
@@ -78,6 +78,22 @@ export default class Algorithm extends Builder {
     html = html.replace(/[ \t]+([»}])/g, '&nbsp;$1');
     node.innerHTML = html;
 
+    // mark steps containing early exits (return/throw/?) with the early-exit class
+    const earlyExitRe = /\b(?:return|throw)\b|[\s(]\?\s/i;
+    // skip the final step of the algorithm, since that's not an early exit
+    // TODO: also skip the final step of an AC
+    for (const li of node.querySelectorAll('emu-alg > ol > li:not(:last-child), emu-alg > ol > li > ol li')) {
+      // only check the li's own text, not text from nested sub-steps
+      let text = '';
+      for (const child of li.childNodes) {
+        if (child.nodeType === 1 && (child as Element).tagName === 'OL') continue;
+        text += child.textContent;
+      }
+      if (earlyExitRe.test(text)) {
+        li.classList.add('early-exit');
+      }
+    }
+
     const labeledStepEntries: StepBiblioEntry[] = [];
     const replaces = node.getAttribute('replaces-step');
     if (replaces) {
diff --git a/test/baselines/generated-reference/algorithms.html b/test/baselines/generated-reference/algorithms.html
index 89f3e02d..8fdeb5fa 100644
--- a/test/baselines/generated-reference/algorithms.html
+++ b/test/baselines/generated-reference/algorithms.html
@@ -11,7 +11,7 @@
   <li><span>Jump to the most recent link target</span><code>`</code></li>
 </ul></div><div id="spec-container">
 
-<emu-alg><ol><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in this spec: <emu-xref aoid="Internal" id="_ref_0"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in ES6: <emu-xref aoid="ReturnIfAbrupt"><a href="https://tc39.es/ecma262/#sec-returnifabrupt">ReturnIfAbrupt</a></emu-xref>(<var>completion</var>);</li><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in a biblio file: <emu-xref aoid="Biblio"><a href="http://example.com/fooSite.html#sec-biblio">Biblio</a></emu-xref>();</li><li>Unfound <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> just don't link: Unfound();</li><li>Can prefix with !&nbsp;and ?.<ol><li>Let <var>foo</var> be ?&nbsp;<emu-xref aoid="Internal" id="_ref_1"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Set <var>foo</var> to !&nbsp;<emu-xref aoid="Internal" id="_ref_2"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Set <var>foo</var> to !&nbsp;SDO of <var>operation</var>.</li><li>Set <var>foo</var> to !&nbsp;<var>operation</var>.<var class="field">[[MOP]]</var>().</li></ol></li><li>A <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> looks like this: <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> { <var class="field">[[Key]]</var>: 0&nbsp;}.</li><li>A <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref> looks like this: « 0, 1&nbsp;».</li></ol></emu-alg>
+<emu-alg><ol><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in this spec: <emu-xref aoid="Internal" id="_ref_0"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in ES6: <emu-xref aoid="ReturnIfAbrupt"><a href="https://tc39.es/ecma262/#sec-returnifabrupt">ReturnIfAbrupt</a></emu-xref>(<var>completion</var>);</li><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in a biblio file: <emu-xref aoid="Biblio"><a href="http://example.com/fooSite.html#sec-biblio">Biblio</a></emu-xref>();</li><li>Unfound <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> just don't link: Unfound();</li><li>Can prefix with !&nbsp;and ?.<ol><li class="early-exit">Let <var>foo</var> be ?&nbsp;<emu-xref aoid="Internal" id="_ref_1"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Set <var>foo</var> to !&nbsp;<emu-xref aoid="Internal" id="_ref_2"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Set <var>foo</var> to !&nbsp;SDO of <var>operation</var>.</li><li>Set <var>foo</var> to !&nbsp;<var>operation</var>.<var class="field">[[MOP]]</var>().</li></ol></li><li>A <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> looks like this: <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> { <var class="field">[[Key]]</var>: 0&nbsp;}.</li><li>A <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref> looks like this: « 0, 1&nbsp;».</li></ol></emu-alg>
 
 <emu-clause id="sec-internal" aoid="Internal">
   <h1><span class="secnum">1</span> Internal Function</h1>

From 9b7b7f193ea025d90fe7d05eb24563c3377a3a5b Mon Sep 17 00:00:00 2001
From: Michael Ficarra <git@michael.ficarra.me>
Date: Sat, 28 Mar 2026 10:12:38 -0600
Subject: [PATCH 02/10] add indicator and keyboard shortcut

---
 css/elements.css                              | 25 +++++++++++-----
 js/menu.js                                    |  4 ++-
 src/Algorithm.ts                              |  4 ++-
 src/Spec.ts                                   |  1 +
 .../generated-reference/abstract-methods.html |  1 +
 .../algorithm-replacements.html               |  1 +
 .../generated-reference/algorithms.html       |  1 +
 .../generated-reference/assets-inline.html    | 30 ++++++++++++++-----
 .../generated-reference/autolinking.html      |  1 +
 .../boilerplate-address.html                  |  1 +
 .../generated-reference/boilerplate-all.html  |  1 +
 .../boilerplate-copyright.html                |  1 +
 .../boilerplate-license.html                  |  1 +
 .../generated-reference/charset-absent.html   |  1 +
 .../generated-reference/charset-present.html  |  1 +
 test/baselines/generated-reference/code.html  |  1 +
 .../generated-reference/copyright.html        |  1 +
 test/baselines/generated-reference/date.html  |  1 +
 test/baselines/generated-reference/dfn.html   |  1 +
 .../generated-reference/duplicate-ids.html    |  1 +
 .../duplicate-productions.html                |  1 +
 .../generated-reference/ecmarkdown.html       |  1 +
 .../generated-reference/effect-user-code.html |  1 +
 .../generated-reference/emd-in-grammar.html   |  1 +
 test/baselines/generated-reference/eqn.html   |  1 +
 .../generated-reference/escaping.html         |  1 +
 .../generated-reference/example.html          |  1 +
 .../baselines/generated-reference/figure.html |  1 +
 .../generated-reference/grammar.html          |  1 +
 .../html-element-attributes.html              |  1 +
 .../generated-reference/imports.html          |  1 +
 .../generated-reference/ins-nonterminal.html  |  1 +
 .../generated-reference/max-clause-depth.html |  1 +
 .../multipage.html/index.html                 |  1 +
 .../multipage.html/multipage/index.html       |  1 +
 .../multipage.html/multipage/second.html      |  1 +
 .../multipage.html/multipage/third.html       |  1 +
 .../namespaces-productions.html               |  1 +
 .../generated-reference/namespaces.html       |  1 +
 .../nonterminal-used-before-definition.html   |  1 +
 test/baselines/generated-reference/notes.html |  1 +
 .../baselines/generated-reference/oldids.html |  1 +
 .../generated-reference/optional-parts.html   |  1 +
 .../proposal-copyright.html                   |  1 +
 .../generated-reference/shortname.html        |  1 +
 .../generated-reference/step-xrefs.html       |  1 +
 .../structured-headers.html                   |  1 +
 test/baselines/generated-reference/test.html  |  1 +
 test/baselines/generated-reference/title.html |  1 +
 test/baselines/generated-reference/toc.html   |  1 +
 test/baselines/generated-reference/xref.html  |  1 +
 51 files changed, 93 insertions(+), 17 deletions(-)

diff --git a/css/elements.css b/css/elements.css
index 6384489b..b536d770 100644
--- a/css/elements.css
+++ b/css/elements.css
@@ -5,7 +5,7 @@
   --link-foreground-color: #206ca7;
   --link-hover-foreground-color: #239dee;
 
-  --user-code-foreground-color: brown;
+  --annotation-foreground-color: brown;
 
   --var-foreground-color: #218379;
 
@@ -89,7 +89,7 @@
       --link-foreground-color: #439de2;
       --link-hover-foreground-color: #80cafb;
 
-      --user-code-foreground-color: brown;
+      --annotation-foreground-color: brown;
 
       --var-foreground-color: #4fb6ab;
 
@@ -337,9 +337,9 @@ span.e-user-code {
 a.e-user-code::before,
 span.e-user-code::before {
   display: none;
-  color: var(--user-code-foreground-color);
+  color: var(--annotation-foreground-color);
   background-color: var(--background-color);
-  border: 2pt solid var(--user-code-foreground-color);
+  border: 2pt solid var(--annotation-foreground-color);
   padding: 0.3ex;
   margin: 0 0.25em 0 0;
   line-height: normal;
@@ -354,12 +354,12 @@ span.e-user-code::before {
 
 a.e-user-code:hover::before,
 span.e-user-code:hover::before {
-  background-color: var(--user-code-foreground-color);
+  background-color: var(--annotation-foreground-color);
   color: var(--background-color);
 }
 
-html.show-ao-annotations a.e-user-code::before,
-html.show-ao-annotations span.e-user-code::before {
+html.show-uc-annotations a.e-user-code::before,
+html.show-uc-annotations span.e-user-code::before {
   display: inline-block;
 }
 
@@ -462,6 +462,17 @@ emu-val {
   font-weight: bold;
 }
 
+emu-alg li.early-exit::before {
+  display: none;
+  color: var(--annotation-foreground-color);
+  content: '⏎';
+  margin-right: 0.25em;
+}
+
+html.show-early-exits emu-alg li.early-exit::before {
+  display: inline-block;
+}
+
 /* depth 1 */
 emu-alg ol,
 /* depth 4 */
diff --git a/js/menu.js b/js/menu.js
index 59349fad..a4cb932a 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -1111,7 +1111,9 @@ function doShortcut(e) {
       location = 'multipage/' + hash;
     }
   } else if (e.key === 'u') {
-    document.documentElement.classList.toggle('show-ao-annotations');
+    document.documentElement.classList.toggle('show-uc-annotations');
+  } else if (e.key === 'r') {
+    document.documentElement.classList.toggle('show-early-exits');
   } else if (e.key === '?') {
     document.getElementById('shortcuts-help').classList.toggle('active');
   }
diff --git a/src/Algorithm.ts b/src/Algorithm.ts
index 52e1515a..273fc337 100644
--- a/src/Algorithm.ts
+++ b/src/Algorithm.ts
@@ -82,7 +82,9 @@ export default class Algorithm extends Builder {
     const earlyExitRe = /\b(?:return|throw)\b|[\s(]\?\s/i;
     // skip the final step of the algorithm, since that's not an early exit
     // TODO: also skip the final step of an AC
-    for (const li of node.querySelectorAll('emu-alg > ol > li:not(:last-child), emu-alg > ol > li > ol li')) {
+    for (const li of node.querySelectorAll(
+      'emu-alg > ol > li:not(:last-child), emu-alg > ol > li > ol li',
+    )) {
       // only check the li's own text, not text from nested sub-steps
       let text = '';
       for (const child of li.childNodes) {
diff --git a/src/Spec.ts b/src/Spec.ts
index 122d3894..45452e38 100644
--- a/src/Spec.ts
+++ b/src/Spec.ts
@@ -1328,6 +1328,7 @@ ${await utils.readFile(path.join(__dirname, '../js/multipage.js'))}
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 ${this.opts.multipage ? `<li><span>Navigate to/from multipage</span><code>m</code></li>` : ''}
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/abstract-methods.html b/test/baselines/generated-reference/abstract-methods.html
index 396a4931..0dd4e181 100644
--- a/test/baselines/generated-reference/abstract-methods.html
+++ b/test/baselines/generated-reference/abstract-methods.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/algorithm-replacements.html b/test/baselines/generated-reference/algorithm-replacements.html
index bee98b42..eca22ada 100644
--- a/test/baselines/generated-reference/algorithm-replacements.html
+++ b/test/baselines/generated-reference/algorithm-replacements.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/algorithms.html b/test/baselines/generated-reference/algorithms.html
index 8fdeb5fa..0de54142 100644
--- a/test/baselines/generated-reference/algorithms.html
+++ b/test/baselines/generated-reference/algorithms.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/assets-inline.html b/test/baselines/generated-reference/assets-inline.html
index 42e33c39..5d7d63ff 100644
--- a/test/baselines/generated-reference/assets-inline.html
+++ b/test/baselines/generated-reference/assets-inline.html
@@ -1195,7 +1195,9 @@
       location = 'multipage/' + hash;
     }
   } else if (e.key === 'u') {
-    document.documentElement.classList.toggle('show-ao-annotations');
+    document.documentElement.classList.toggle('show-uc-annotations');
+  } else if (e.key === 'r') {
+    document.documentElement.classList.toggle('show-early-exits');
   } else if (e.key === '?') {
     document.getElementById('shortcuts-help').classList.toggle('active');
   }
@@ -1623,7 +1625,7 @@
   --link-foreground-color: #206ca7;
   --link-hover-foreground-color: #239dee;
 
-  --user-code-foreground-color: brown;
+  --annotation-foreground-color: brown;
 
   --var-foreground-color: #218379;
 
@@ -1707,7 +1709,7 @@
       --link-foreground-color: #439de2;
       --link-hover-foreground-color: #80cafb;
 
-      --user-code-foreground-color: brown;
+      --annotation-foreground-color: brown;
 
       --var-foreground-color: #4fb6ab;
 
@@ -1955,9 +1957,9 @@
 a.e-user-code::before,
 span.e-user-code::before {
   display: none;
-  color: var(--user-code-foreground-color);
+  color: var(--annotation-foreground-color);
   background-color: var(--background-color);
-  border: 2pt solid var(--user-code-foreground-color);
+  border: 2pt solid var(--annotation-foreground-color);
   padding: 0.3ex;
   margin: 0 0.25em 0 0;
   line-height: normal;
@@ -1972,12 +1974,12 @@
 
 a.e-user-code:hover::before,
 span.e-user-code:hover::before {
-  background-color: var(--user-code-foreground-color);
+  background-color: var(--annotation-foreground-color);
   color: var(--background-color);
 }
 
-html.show-ao-annotations a.e-user-code::before,
-html.show-ao-annotations span.e-user-code::before {
+html.show-uc-annotations a.e-user-code::before,
+html.show-uc-annotations span.e-user-code::before {
   display: inline-block;
 }
 
@@ -2080,6 +2082,17 @@
   font-weight: bold;
 }
 
+emu-alg li.early-exit::before {
+  display: none;
+  color: var(--annotation-foreground-color);
+  content: '⏎';
+  margin-right: 0.25em;
+}
+
+html.show-early-exits emu-alg li.early-exit::before {
+  display: inline-block;
+}
+
 /* depth 1 */
 emu-alg ol,
 /* depth 4 */
@@ -3985,6 +3998,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/autolinking.html b/test/baselines/generated-reference/autolinking.html
index d6ebd7ca..8216160b 100644
--- a/test/baselines/generated-reference/autolinking.html
+++ b/test/baselines/generated-reference/autolinking.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/boilerplate-address.html b/test/baselines/generated-reference/boilerplate-address.html
index dd03538f..9f125496 100644
--- a/test/baselines/generated-reference/boilerplate-address.html
+++ b/test/baselines/generated-reference/boilerplate-address.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/boilerplate-all.html b/test/baselines/generated-reference/boilerplate-all.html
index c5344bfe..6e2b501e 100644
--- a/test/baselines/generated-reference/boilerplate-all.html
+++ b/test/baselines/generated-reference/boilerplate-all.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/boilerplate-copyright.html b/test/baselines/generated-reference/boilerplate-copyright.html
index 4cf3a8e2..9c778070 100644
--- a/test/baselines/generated-reference/boilerplate-copyright.html
+++ b/test/baselines/generated-reference/boilerplate-copyright.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/boilerplate-license.html b/test/baselines/generated-reference/boilerplate-license.html
index 3287cce9..9f26ebab 100644
--- a/test/baselines/generated-reference/boilerplate-license.html
+++ b/test/baselines/generated-reference/boilerplate-license.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/charset-absent.html b/test/baselines/generated-reference/charset-absent.html
index 7c3034bd..4f930dec 100644
--- a/test/baselines/generated-reference/charset-absent.html
+++ b/test/baselines/generated-reference/charset-absent.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/charset-present.html b/test/baselines/generated-reference/charset-present.html
index 6a2b47bf..02cfbcc5 100644
--- a/test/baselines/generated-reference/charset-present.html
+++ b/test/baselines/generated-reference/charset-present.html
@@ -4,6 +4,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/code.html b/test/baselines/generated-reference/code.html
index c3afa1f0..0e123d3b 100644
--- a/test/baselines/generated-reference/code.html
+++ b/test/baselines/generated-reference/code.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/copyright.html b/test/baselines/generated-reference/copyright.html
index 0df9372a..6a761afb 100644
--- a/test/baselines/generated-reference/copyright.html
+++ b/test/baselines/generated-reference/copyright.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/date.html b/test/baselines/generated-reference/date.html
index 3cd9b3ec..9d3dfea9 100644
--- a/test/baselines/generated-reference/date.html
+++ b/test/baselines/generated-reference/date.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/dfn.html b/test/baselines/generated-reference/dfn.html
index 43f49617..6e8812c3 100644
--- a/test/baselines/generated-reference/dfn.html
+++ b/test/baselines/generated-reference/dfn.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/duplicate-ids.html b/test/baselines/generated-reference/duplicate-ids.html
index 6134cdf9..0d0e6059 100644
--- a/test/baselines/generated-reference/duplicate-ids.html
+++ b/test/baselines/generated-reference/duplicate-ids.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/duplicate-productions.html b/test/baselines/generated-reference/duplicate-productions.html
index defe65e3..fa0d3436 100644
--- a/test/baselines/generated-reference/duplicate-productions.html
+++ b/test/baselines/generated-reference/duplicate-productions.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/ecmarkdown.html b/test/baselines/generated-reference/ecmarkdown.html
index 5aeb8f5d..3ee82e5e 100644
--- a/test/baselines/generated-reference/ecmarkdown.html
+++ b/test/baselines/generated-reference/ecmarkdown.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/effect-user-code.html b/test/baselines/generated-reference/effect-user-code.html
index 10c992d1..991b8d9f 100644
--- a/test/baselines/generated-reference/effect-user-code.html
+++ b/test/baselines/generated-reference/effect-user-code.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/emd-in-grammar.html b/test/baselines/generated-reference/emd-in-grammar.html
index 0948baa2..d20dc4c7 100644
--- a/test/baselines/generated-reference/emd-in-grammar.html
+++ b/test/baselines/generated-reference/emd-in-grammar.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/eqn.html b/test/baselines/generated-reference/eqn.html
index 77f671e2..84dbbe38 100644
--- a/test/baselines/generated-reference/eqn.html
+++ b/test/baselines/generated-reference/eqn.html
@@ -4,6 +4,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/escaping.html b/test/baselines/generated-reference/escaping.html
index ba2fdd0b..6d11a53b 100644
--- a/test/baselines/generated-reference/escaping.html
+++ b/test/baselines/generated-reference/escaping.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/example.html b/test/baselines/generated-reference/example.html
index 2a20b2b6..130af875 100644
--- a/test/baselines/generated-reference/example.html
+++ b/test/baselines/generated-reference/example.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/figure.html b/test/baselines/generated-reference/figure.html
index 2c1e9de6..8787743a 100644
--- a/test/baselines/generated-reference/figure.html
+++ b/test/baselines/generated-reference/figure.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/grammar.html b/test/baselines/generated-reference/grammar.html
index 5bee5469..4fd44d50 100644
--- a/test/baselines/generated-reference/grammar.html
+++ b/test/baselines/generated-reference/grammar.html
@@ -4,6 +4,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/html-element-attributes.html b/test/baselines/generated-reference/html-element-attributes.html
index 01b48ba2..fdc66e8c 100644
--- a/test/baselines/generated-reference/html-element-attributes.html
+++ b/test/baselines/generated-reference/html-element-attributes.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/imports.html b/test/baselines/generated-reference/imports.html
index 8fac1b01..2d07cee8 100644
--- a/test/baselines/generated-reference/imports.html
+++ b/test/baselines/generated-reference/imports.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/ins-nonterminal.html b/test/baselines/generated-reference/ins-nonterminal.html
index bdccb638..76e22e22 100644
--- a/test/baselines/generated-reference/ins-nonterminal.html
+++ b/test/baselines/generated-reference/ins-nonterminal.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/max-clause-depth.html b/test/baselines/generated-reference/max-clause-depth.html
index a9cc5bca..a9beb397 100644
--- a/test/baselines/generated-reference/max-clause-depth.html
+++ b/test/baselines/generated-reference/max-clause-depth.html
@@ -7,6 +7,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/multipage.html/index.html b/test/baselines/generated-reference/multipage.html/index.html
index b8afe07f..1f11ffe5 100644
--- a/test/baselines/generated-reference/multipage.html/index.html
+++ b/test/baselines/generated-reference/multipage.html/index.html
@@ -7,6 +7,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 <li><span>Navigate to/from multipage</span><code>m</code></li>
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/multipage.html/multipage/index.html b/test/baselines/generated-reference/multipage.html/multipage/index.html
index 4542d5b9..3c7f3043 100644
--- a/test/baselines/generated-reference/multipage.html/multipage/index.html
+++ b/test/baselines/generated-reference/multipage.html/multipage/index.html
@@ -12,6 +12,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 <li><span>Navigate to/from multipage</span><code>m</code></li>
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/multipage.html/multipage/second.html b/test/baselines/generated-reference/multipage.html/multipage/second.html
index b99ee742..d96af1cb 100644
--- a/test/baselines/generated-reference/multipage.html/multipage/second.html
+++ b/test/baselines/generated-reference/multipage.html/multipage/second.html
@@ -12,6 +12,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 <li><span>Navigate to/from multipage</span><code>m</code></li>
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/multipage.html/multipage/third.html b/test/baselines/generated-reference/multipage.html/multipage/third.html
index af2f450c..679ab9bc 100644
--- a/test/baselines/generated-reference/multipage.html/multipage/third.html
+++ b/test/baselines/generated-reference/multipage.html/multipage/third.html
@@ -12,6 +12,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 <li><span>Navigate to/from multipage</span><code>m</code></li>
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/namespaces-productions.html b/test/baselines/generated-reference/namespaces-productions.html
index 96bfa6ff..5cd80506 100644
--- a/test/baselines/generated-reference/namespaces-productions.html
+++ b/test/baselines/generated-reference/namespaces-productions.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/namespaces.html b/test/baselines/generated-reference/namespaces.html
index ce2903cd..3feceb01 100644
--- a/test/baselines/generated-reference/namespaces.html
+++ b/test/baselines/generated-reference/namespaces.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/nonterminal-used-before-definition.html b/test/baselines/generated-reference/nonterminal-used-before-definition.html
index da313438..5332cbcc 100644
--- a/test/baselines/generated-reference/nonterminal-used-before-definition.html
+++ b/test/baselines/generated-reference/nonterminal-used-before-definition.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/notes.html b/test/baselines/generated-reference/notes.html
index b2f3fe52..8baa2c11 100644
--- a/test/baselines/generated-reference/notes.html
+++ b/test/baselines/generated-reference/notes.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/oldids.html b/test/baselines/generated-reference/oldids.html
index e2f0047c..72e8116b 100644
--- a/test/baselines/generated-reference/oldids.html
+++ b/test/baselines/generated-reference/oldids.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/optional-parts.html b/test/baselines/generated-reference/optional-parts.html
index 9ab5fc57..af2ffe2e 100644
--- a/test/baselines/generated-reference/optional-parts.html
+++ b/test/baselines/generated-reference/optional-parts.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/proposal-copyright.html b/test/baselines/generated-reference/proposal-copyright.html
index 44960a2b..412fb35c 100644
--- a/test/baselines/generated-reference/proposal-copyright.html
+++ b/test/baselines/generated-reference/proposal-copyright.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/shortname.html b/test/baselines/generated-reference/shortname.html
index 4ec6be7c..abbca04a 100644
--- a/test/baselines/generated-reference/shortname.html
+++ b/test/baselines/generated-reference/shortname.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/step-xrefs.html b/test/baselines/generated-reference/step-xrefs.html
index 671851d8..7d3a8aa2 100644
--- a/test/baselines/generated-reference/step-xrefs.html
+++ b/test/baselines/generated-reference/step-xrefs.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/structured-headers.html b/test/baselines/generated-reference/structured-headers.html
index 93742034..d1e78652 100644
--- a/test/baselines/generated-reference/structured-headers.html
+++ b/test/baselines/generated-reference/structured-headers.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/test.html b/test/baselines/generated-reference/test.html
index ebc71926..557f79ca 100644
--- a/test/baselines/generated-reference/test.html
+++ b/test/baselines/generated-reference/test.html
@@ -8,6 +8,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/title.html b/test/baselines/generated-reference/title.html
index 66c521de..6388bc01 100644
--- a/test/baselines/generated-reference/title.html
+++ b/test/baselines/generated-reference/title.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/toc.html b/test/baselines/generated-reference/toc.html
index 8227a59f..f743e332 100644
--- a/test/baselines/generated-reference/toc.html
+++ b/test/baselines/generated-reference/toc.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/xref.html b/test/baselines/generated-reference/xref.html
index fabc8377..bc263a13 100644
--- a/test/baselines/generated-reference/xref.html
+++ b/test/baselines/generated-reference/xref.html
@@ -3,6 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>r</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>

From 8eb2a1b69f32601f4174ee75132c869f13689c87 Mon Sep 17 00:00:00 2001
From: Michael Ficarra <git@michael.ficarra.me>
Date: Sat, 28 Mar 2026 10:20:36 -0600
Subject: [PATCH 03/10] change shortcut from `r` to `e`

---
 js/menu.js                                                    | 2 +-
 src/Spec.ts                                                   | 2 +-
 test/baselines/generated-reference/abstract-methods.html      | 2 +-
 .../baselines/generated-reference/algorithm-replacements.html | 2 +-
 test/baselines/generated-reference/algorithms.html            | 2 +-
 test/baselines/generated-reference/assets-inline.html         | 4 ++--
 test/baselines/generated-reference/autolinking.html           | 2 +-
 test/baselines/generated-reference/boilerplate-address.html   | 2 +-
 test/baselines/generated-reference/boilerplate-all.html       | 2 +-
 test/baselines/generated-reference/boilerplate-copyright.html | 2 +-
 test/baselines/generated-reference/boilerplate-license.html   | 2 +-
 test/baselines/generated-reference/charset-absent.html        | 2 +-
 test/baselines/generated-reference/charset-present.html       | 2 +-
 test/baselines/generated-reference/code.html                  | 2 +-
 test/baselines/generated-reference/copyright.html             | 2 +-
 test/baselines/generated-reference/date.html                  | 2 +-
 test/baselines/generated-reference/dfn.html                   | 2 +-
 test/baselines/generated-reference/duplicate-ids.html         | 2 +-
 test/baselines/generated-reference/duplicate-productions.html | 2 +-
 test/baselines/generated-reference/ecmarkdown.html            | 2 +-
 test/baselines/generated-reference/effect-user-code.html      | 2 +-
 test/baselines/generated-reference/emd-in-grammar.html        | 2 +-
 test/baselines/generated-reference/eqn.html                   | 2 +-
 test/baselines/generated-reference/escaping.html              | 2 +-
 test/baselines/generated-reference/example.html               | 2 +-
 test/baselines/generated-reference/figure.html                | 2 +-
 test/baselines/generated-reference/grammar.html               | 2 +-
 .../generated-reference/html-element-attributes.html          | 2 +-
 test/baselines/generated-reference/imports.html               | 2 +-
 test/baselines/generated-reference/ins-nonterminal.html       | 2 +-
 test/baselines/generated-reference/max-clause-depth.html      | 2 +-
 test/baselines/generated-reference/multipage.html/index.html  | 2 +-
 .../generated-reference/multipage.html/multipage/index.html   | 2 +-
 .../generated-reference/multipage.html/multipage/second.html  | 2 +-
 .../generated-reference/multipage.html/multipage/third.html   | 2 +-
 .../baselines/generated-reference/namespaces-productions.html | 2 +-
 test/baselines/generated-reference/namespaces.html            | 2 +-
 .../nonterminal-used-before-definition.html                   | 2 +-
 test/baselines/generated-reference/notes.html                 | 2 +-
 test/baselines/generated-reference/oldids.html                | 2 +-
 test/baselines/generated-reference/optional-parts.html        | 2 +-
 test/baselines/generated-reference/proposal-copyright.html    | 2 +-
 test/baselines/generated-reference/shortname.html             | 2 +-
 test/baselines/generated-reference/step-xrefs.html            | 2 +-
 test/baselines/generated-reference/structured-headers.html    | 2 +-
 test/baselines/generated-reference/test.html                  | 2 +-
 test/baselines/generated-reference/title.html                 | 2 +-
 test/baselines/generated-reference/toc.html                   | 2 +-
 test/baselines/generated-reference/xref.html                  | 2 +-
 49 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/js/menu.js b/js/menu.js
index a4cb932a..4b1a8515 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -1112,7 +1112,7 @@ function doShortcut(e) {
     }
   } else if (e.key === 'u') {
     document.documentElement.classList.toggle('show-uc-annotations');
-  } else if (e.key === 'r') {
+  } else if (e.key === 'e') {
     document.documentElement.classList.toggle('show-early-exits');
   } else if (e.key === '?') {
     document.getElementById('shortcuts-help').classList.toggle('active');
diff --git a/src/Spec.ts b/src/Spec.ts
index 45452e38..cf675b84 100644
--- a/src/Spec.ts
+++ b/src/Spec.ts
@@ -1328,7 +1328,7 @@ ${await utils.readFile(path.join(__dirname, '../js/multipage.js'))}
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 ${this.opts.multipage ? `<li><span>Navigate to/from multipage</span><code>m</code></li>` : ''}
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/abstract-methods.html b/test/baselines/generated-reference/abstract-methods.html
index 0dd4e181..87ef9a76 100644
--- a/test/baselines/generated-reference/abstract-methods.html
+++ b/test/baselines/generated-reference/abstract-methods.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/algorithm-replacements.html b/test/baselines/generated-reference/algorithm-replacements.html
index eca22ada..7ddc347c 100644
--- a/test/baselines/generated-reference/algorithm-replacements.html
+++ b/test/baselines/generated-reference/algorithm-replacements.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/algorithms.html b/test/baselines/generated-reference/algorithms.html
index 0de54142..841cd1a0 100644
--- a/test/baselines/generated-reference/algorithms.html
+++ b/test/baselines/generated-reference/algorithms.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/assets-inline.html b/test/baselines/generated-reference/assets-inline.html
index 5d7d63ff..087695d7 100644
--- a/test/baselines/generated-reference/assets-inline.html
+++ b/test/baselines/generated-reference/assets-inline.html
@@ -1196,7 +1196,7 @@
     }
   } else if (e.key === 'u') {
     document.documentElement.classList.toggle('show-uc-annotations');
-  } else if (e.key === 'r') {
+  } else if (e.key === 'e') {
     document.documentElement.classList.toggle('show-early-exits');
   } else if (e.key === '?') {
     document.getElementById('shortcuts-help').classList.toggle('active');
@@ -3998,7 +3998,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/autolinking.html b/test/baselines/generated-reference/autolinking.html
index 8216160b..b31aaba5 100644
--- a/test/baselines/generated-reference/autolinking.html
+++ b/test/baselines/generated-reference/autolinking.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/boilerplate-address.html b/test/baselines/generated-reference/boilerplate-address.html
index 9f125496..bfde053b 100644
--- a/test/baselines/generated-reference/boilerplate-address.html
+++ b/test/baselines/generated-reference/boilerplate-address.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/boilerplate-all.html b/test/baselines/generated-reference/boilerplate-all.html
index 6e2b501e..1fb189cf 100644
--- a/test/baselines/generated-reference/boilerplate-all.html
+++ b/test/baselines/generated-reference/boilerplate-all.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/boilerplate-copyright.html b/test/baselines/generated-reference/boilerplate-copyright.html
index 9c778070..f3f33ed7 100644
--- a/test/baselines/generated-reference/boilerplate-copyright.html
+++ b/test/baselines/generated-reference/boilerplate-copyright.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/boilerplate-license.html b/test/baselines/generated-reference/boilerplate-license.html
index 9f26ebab..e6b47851 100644
--- a/test/baselines/generated-reference/boilerplate-license.html
+++ b/test/baselines/generated-reference/boilerplate-license.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/charset-absent.html b/test/baselines/generated-reference/charset-absent.html
index 4f930dec..aae333cb 100644
--- a/test/baselines/generated-reference/charset-absent.html
+++ b/test/baselines/generated-reference/charset-absent.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/charset-present.html b/test/baselines/generated-reference/charset-present.html
index 02cfbcc5..917f36bd 100644
--- a/test/baselines/generated-reference/charset-present.html
+++ b/test/baselines/generated-reference/charset-present.html
@@ -4,7 +4,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/code.html b/test/baselines/generated-reference/code.html
index 0e123d3b..660e1aec 100644
--- a/test/baselines/generated-reference/code.html
+++ b/test/baselines/generated-reference/code.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/copyright.html b/test/baselines/generated-reference/copyright.html
index 6a761afb..b6aef90e 100644
--- a/test/baselines/generated-reference/copyright.html
+++ b/test/baselines/generated-reference/copyright.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/date.html b/test/baselines/generated-reference/date.html
index 9d3dfea9..1c876988 100644
--- a/test/baselines/generated-reference/date.html
+++ b/test/baselines/generated-reference/date.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/dfn.html b/test/baselines/generated-reference/dfn.html
index 6e8812c3..4b9a4f69 100644
--- a/test/baselines/generated-reference/dfn.html
+++ b/test/baselines/generated-reference/dfn.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/duplicate-ids.html b/test/baselines/generated-reference/duplicate-ids.html
index 0d0e6059..65709eff 100644
--- a/test/baselines/generated-reference/duplicate-ids.html
+++ b/test/baselines/generated-reference/duplicate-ids.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/duplicate-productions.html b/test/baselines/generated-reference/duplicate-productions.html
index fa0d3436..8788a583 100644
--- a/test/baselines/generated-reference/duplicate-productions.html
+++ b/test/baselines/generated-reference/duplicate-productions.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/ecmarkdown.html b/test/baselines/generated-reference/ecmarkdown.html
index 3ee82e5e..25446f04 100644
--- a/test/baselines/generated-reference/ecmarkdown.html
+++ b/test/baselines/generated-reference/ecmarkdown.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/effect-user-code.html b/test/baselines/generated-reference/effect-user-code.html
index 991b8d9f..76fbc0a0 100644
--- a/test/baselines/generated-reference/effect-user-code.html
+++ b/test/baselines/generated-reference/effect-user-code.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/emd-in-grammar.html b/test/baselines/generated-reference/emd-in-grammar.html
index d20dc4c7..c616811b 100644
--- a/test/baselines/generated-reference/emd-in-grammar.html
+++ b/test/baselines/generated-reference/emd-in-grammar.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/eqn.html b/test/baselines/generated-reference/eqn.html
index 84dbbe38..52dc7fd2 100644
--- a/test/baselines/generated-reference/eqn.html
+++ b/test/baselines/generated-reference/eqn.html
@@ -4,7 +4,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/escaping.html b/test/baselines/generated-reference/escaping.html
index 6d11a53b..e3d0b883 100644
--- a/test/baselines/generated-reference/escaping.html
+++ b/test/baselines/generated-reference/escaping.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/example.html b/test/baselines/generated-reference/example.html
index 130af875..a3a30397 100644
--- a/test/baselines/generated-reference/example.html
+++ b/test/baselines/generated-reference/example.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/figure.html b/test/baselines/generated-reference/figure.html
index 8787743a..a9a70526 100644
--- a/test/baselines/generated-reference/figure.html
+++ b/test/baselines/generated-reference/figure.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/grammar.html b/test/baselines/generated-reference/grammar.html
index 4fd44d50..a3e28104 100644
--- a/test/baselines/generated-reference/grammar.html
+++ b/test/baselines/generated-reference/grammar.html
@@ -4,7 +4,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/html-element-attributes.html b/test/baselines/generated-reference/html-element-attributes.html
index fdc66e8c..04f42fb6 100644
--- a/test/baselines/generated-reference/html-element-attributes.html
+++ b/test/baselines/generated-reference/html-element-attributes.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/imports.html b/test/baselines/generated-reference/imports.html
index 2d07cee8..9058f1d5 100644
--- a/test/baselines/generated-reference/imports.html
+++ b/test/baselines/generated-reference/imports.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/ins-nonterminal.html b/test/baselines/generated-reference/ins-nonterminal.html
index 76e22e22..4a222a3c 100644
--- a/test/baselines/generated-reference/ins-nonterminal.html
+++ b/test/baselines/generated-reference/ins-nonterminal.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/max-clause-depth.html b/test/baselines/generated-reference/max-clause-depth.html
index a9beb397..6d4f9276 100644
--- a/test/baselines/generated-reference/max-clause-depth.html
+++ b/test/baselines/generated-reference/max-clause-depth.html
@@ -7,7 +7,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/multipage.html/index.html b/test/baselines/generated-reference/multipage.html/index.html
index 1f11ffe5..2364f993 100644
--- a/test/baselines/generated-reference/multipage.html/index.html
+++ b/test/baselines/generated-reference/multipage.html/index.html
@@ -7,7 +7,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 <li><span>Navigate to/from multipage</span><code>m</code></li>
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/multipage.html/multipage/index.html b/test/baselines/generated-reference/multipage.html/multipage/index.html
index 3c7f3043..f0c96645 100644
--- a/test/baselines/generated-reference/multipage.html/multipage/index.html
+++ b/test/baselines/generated-reference/multipage.html/multipage/index.html
@@ -12,7 +12,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 <li><span>Navigate to/from multipage</span><code>m</code></li>
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/multipage.html/multipage/second.html b/test/baselines/generated-reference/multipage.html/multipage/second.html
index d96af1cb..3184c5a3 100644
--- a/test/baselines/generated-reference/multipage.html/multipage/second.html
+++ b/test/baselines/generated-reference/multipage.html/multipage/second.html
@@ -12,7 +12,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 <li><span>Navigate to/from multipage</span><code>m</code></li>
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/multipage.html/multipage/third.html b/test/baselines/generated-reference/multipage.html/multipage/third.html
index 679ab9bc..3f038cb4 100644
--- a/test/baselines/generated-reference/multipage.html/multipage/third.html
+++ b/test/baselines/generated-reference/multipage.html/multipage/third.html
@@ -12,7 +12,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 <li><span>Navigate to/from multipage</span><code>m</code></li>
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/namespaces-productions.html b/test/baselines/generated-reference/namespaces-productions.html
index 5cd80506..82b9a59b 100644
--- a/test/baselines/generated-reference/namespaces-productions.html
+++ b/test/baselines/generated-reference/namespaces-productions.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/namespaces.html b/test/baselines/generated-reference/namespaces.html
index 3feceb01..18090706 100644
--- a/test/baselines/generated-reference/namespaces.html
+++ b/test/baselines/generated-reference/namespaces.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/nonterminal-used-before-definition.html b/test/baselines/generated-reference/nonterminal-used-before-definition.html
index 5332cbcc..79173636 100644
--- a/test/baselines/generated-reference/nonterminal-used-before-definition.html
+++ b/test/baselines/generated-reference/nonterminal-used-before-definition.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/notes.html b/test/baselines/generated-reference/notes.html
index 8baa2c11..51e749b0 100644
--- a/test/baselines/generated-reference/notes.html
+++ b/test/baselines/generated-reference/notes.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/oldids.html b/test/baselines/generated-reference/oldids.html
index 72e8116b..bed6c421 100644
--- a/test/baselines/generated-reference/oldids.html
+++ b/test/baselines/generated-reference/oldids.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/optional-parts.html b/test/baselines/generated-reference/optional-parts.html
index af2ffe2e..e660887a 100644
--- a/test/baselines/generated-reference/optional-parts.html
+++ b/test/baselines/generated-reference/optional-parts.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/proposal-copyright.html b/test/baselines/generated-reference/proposal-copyright.html
index 412fb35c..1d834f47 100644
--- a/test/baselines/generated-reference/proposal-copyright.html
+++ b/test/baselines/generated-reference/proposal-copyright.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/shortname.html b/test/baselines/generated-reference/shortname.html
index abbca04a..743e5af8 100644
--- a/test/baselines/generated-reference/shortname.html
+++ b/test/baselines/generated-reference/shortname.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/step-xrefs.html b/test/baselines/generated-reference/step-xrefs.html
index 7d3a8aa2..da2c13da 100644
--- a/test/baselines/generated-reference/step-xrefs.html
+++ b/test/baselines/generated-reference/step-xrefs.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/structured-headers.html b/test/baselines/generated-reference/structured-headers.html
index d1e78652..d491d66e 100644
--- a/test/baselines/generated-reference/structured-headers.html
+++ b/test/baselines/generated-reference/structured-headers.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/test.html b/test/baselines/generated-reference/test.html
index 557f79ca..0bc89563 100644
--- a/test/baselines/generated-reference/test.html
+++ b/test/baselines/generated-reference/test.html
@@ -8,7 +8,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/title.html b/test/baselines/generated-reference/title.html
index 6388bc01..b3309ee8 100644
--- a/test/baselines/generated-reference/title.html
+++ b/test/baselines/generated-reference/title.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/toc.html b/test/baselines/generated-reference/toc.html
index f743e332..8c10a492 100644
--- a/test/baselines/generated-reference/toc.html
+++ b/test/baselines/generated-reference/toc.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>
diff --git a/test/baselines/generated-reference/xref.html b/test/baselines/generated-reference/xref.html
index bc263a13..187b52cd 100644
--- a/test/baselines/generated-reference/xref.html
+++ b/test/baselines/generated-reference/xref.html
@@ -3,7 +3,7 @@
 <ul>
   <li><span>Toggle shortcuts help</span><code>?</code></li>
   <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
-  <li><span>Toggle early exit annotations</span><code>r</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
 
   <li><span>Jump to search box</span><code>/</code></li>
   <li><span>Toggle pinning of the current clause</span><code>p</code></li>

From 68a244311e3e15871e20d9d01acbc33f8f3f39ad Mon Sep 17 00:00:00 2001
From: Michael Ficarra <git@michael.ficarra.me>
Date: Sat, 28 Mar 2026 10:36:11 -0600
Subject: [PATCH 04/10] don't mark final returns in ACs

---
 src/Algorithm.ts | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/Algorithm.ts b/src/Algorithm.ts
index 273fc337..29a8a846 100644
--- a/src/Algorithm.ts
+++ b/src/Algorithm.ts
@@ -80,19 +80,20 @@ export default class Algorithm extends Builder {
 
     // mark steps containing early exits (return/throw/?) with the early-exit class
     const earlyExitRe = /\b(?:return|throw)\b|[\s(]\?\s/i;
-    // skip the final step of the algorithm, since that's not an early exit
-    // TODO: also skip the final step of an AC
-    for (const li of node.querySelectorAll(
-      'emu-alg > ol > li:not(:last-child), emu-alg > ol > li > ol li',
-    )) {
-      // only check the li's own text, not text from nested sub-steps
-      let text = '';
-      for (const child of li.childNodes) {
-        if (child.nodeType === 1 && (child as Element).tagName === 'OL') continue;
-        text += child.textContent;
-      }
-      if (earlyExitRe.test(text)) {
-        li.classList.add('early-exit');
+    const acRe = /\ba new Abstract Closure\b/i;
+    for (const ol of node.querySelectorAll('ol')) {
+      const isTopLevel = ol.parentElement === node;
+      const isACBody =
+        !isTopLevel &&
+        ol.parentElement?.tagName === 'LI' &&
+        acRe.test(ownTextContent(ol.parentElement));
+      const items = ol.children;
+      for (let i = 0; i < items.length; i++) {
+        if (i === items.length - 1 && (isTopLevel || isACBody)) continue;
+        const text = ownTextContent(items[i]);
+        if (earlyExitRe.test(text)) {
+          items[i].classList.add('early-exit');
+        }
       }
     }
 
@@ -181,6 +182,16 @@ export default class Algorithm extends Builder {
   static readonly elements = ['EMU-ALG'] as const;
 }
 
+// get text content of an element excluding nested <ol> children
+function ownTextContent(el: Element): string {
+  let text = '';
+  for (const child of el.childNodes) {
+    if (child.nodeType === 1 && (child as Element).tagName === 'OL') continue;
+    text += child.textContent;
+  }
+  return text;
+}
+
 function getStepNumbers(item: Element) {
   const { indexOf } = Array.prototype;
   const counts = [];

From e0d32e1ec487d2b7382d79e42814bf42f521806c Mon Sep 17 00:00:00 2001
From: Michael Ficarra <git@michael.ficarra.me>
Date: Sat, 28 Mar 2026 18:41:11 -0600
Subject: [PATCH 05/10] support 262 macros

---
 src/Algorithm.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Algorithm.ts b/src/Algorithm.ts
index 29a8a846..acad8a48 100644
--- a/src/Algorithm.ts
+++ b/src/Algorithm.ts
@@ -79,7 +79,9 @@ export default class Algorithm extends Builder {
     node.innerHTML = html;
 
     // mark steps containing early exits (return/throw/?) with the early-exit class
-    const earlyExitRe = /\b(?:return|throw)\b|[\s(]\?\s/i;
+    const earlyExitIndicator = /\b(?:return|throw)\b|[\s(]\?\s/i;
+    // these are macros in ECMA-262 that expand to steps that include a return/throw/?
+    const earlyExitMacro = /\bIfAbrupt(?:CloseIterator|CloseAsyncIterator|RejectPromise)\(/;
     const acRe = /\ba new Abstract Closure\b/i;
     for (const ol of node.querySelectorAll('ol')) {
       const isTopLevel = ol.parentElement === node;
@@ -91,7 +93,7 @@ export default class Algorithm extends Builder {
       for (let i = 0; i < items.length; i++) {
         if (i === items.length - 1 && (isTopLevel || isACBody)) continue;
         const text = ownTextContent(items[i]);
-        if (earlyExitRe.test(text)) {
+        if (earlyExitIndicator.test(text) || earlyExitMacro.test(text)) {
           items[i].classList.add('early-exit');
         }
       }

From 54c5e071212bbdd3468763465f090d72a796ff64 Mon Sep 17 00:00:00 2001
From: Michael Ficarra <git@michael.ficarra.me>
Date: Sat, 28 Mar 2026 18:59:45 -0600
Subject: [PATCH 06/10] match styling of user code annotations

---
 css/elements.css                                      | 6 ++++++
 test/baselines/generated-reference/assets-inline.html | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/css/elements.css b/css/elements.css
index b536d770..d3121ea8 100644
--- a/css/elements.css
+++ b/css/elements.css
@@ -464,9 +464,15 @@ emu-val {
 
 emu-alg li.early-exit::before {
   display: none;
+  border: 2pt solid var(--annotation-foreground-color);
+  font-size: small;
   color: var(--annotation-foreground-color);
+  padding: 0 0.25em;
+  background-color: var(--background-color);
   content: '⏎';
   margin-right: 0.25em;
+  line-height: 16px;
+  vertical-align: middle;
 }
 
 html.show-early-exits emu-alg li.early-exit::before {
diff --git a/test/baselines/generated-reference/assets-inline.html b/test/baselines/generated-reference/assets-inline.html
index 087695d7..14df8e38 100644
--- a/test/baselines/generated-reference/assets-inline.html
+++ b/test/baselines/generated-reference/assets-inline.html
@@ -2084,9 +2084,15 @@
 
 emu-alg li.early-exit::before {
   display: none;
+  border: 2pt solid var(--annotation-foreground-color);
+  font-size: small;
   color: var(--annotation-foreground-color);
+  padding: 0 0.25em;
+  background-color: var(--background-color);
   content: '⏎';
   margin-right: 0.25em;
+  line-height: 16px;
+  vertical-align: middle;
 }
 
 html.show-early-exits emu-alg li.early-exit::before {

From 303f440f85d7d4cd1b9445f0715c3b850cc893da Mon Sep 17 00:00:00 2001
From: Michael Ficarra <m.ficarra@f5.com>
Date: Mon, 30 Mar 2026 11:49:02 -0600
Subject: [PATCH 07/10] fix issues

---
 src/Algorithm.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Algorithm.ts b/src/Algorithm.ts
index acad8a48..5920ade6 100644
--- a/src/Algorithm.ts
+++ b/src/Algorithm.ts
@@ -82,6 +82,7 @@ export default class Algorithm extends Builder {
     const earlyExitIndicator = /\b(?:return|throw)\b|[\s(]\?\s/i;
     // these are macros in ECMA-262 that expand to steps that include a return/throw/?
     const earlyExitMacro = /\bIfAbrupt(?:CloseIterator|CloseAsyncIterator|RejectPromise)\(/;
+    const note = /^(?:NOTE|Assert): /;
     const acRe = /\ba new Abstract Closure\b/i;
     for (const ol of node.querySelectorAll('ol')) {
       const isTopLevel = ol.parentElement === node;
@@ -93,7 +94,7 @@ export default class Algorithm extends Builder {
       for (let i = 0; i < items.length; i++) {
         if (i === items.length - 1 && (isTopLevel || isACBody)) continue;
         const text = ownTextContent(items[i]);
-        if (earlyExitIndicator.test(text) || earlyExitMacro.test(text)) {
+        if ((earlyExitIndicator.test(text) || earlyExitMacro.test(text)) && !note.test(text)) {
           items[i].classList.add('early-exit');
         }
       }
@@ -188,8 +189,9 @@ export default class Algorithm extends Builder {
 function ownTextContent(el: Element): string {
   let text = '';
   for (const child of el.childNodes) {
-    if (child.nodeType === 1 && (child as Element).tagName === 'OL') continue;
-    text += child.textContent;
+    if (child.nodeType === 3) {
+      text += child.textContent;
+    }
   }
   return text;
 }

From 6a96e9287c2f759500b5ad41415d8bca71131949 Mon Sep 17 00:00:00 2001
From: Michael Ficarra <git@michael.ficarra.me>
Date: Mon, 30 Mar 2026 18:13:22 -0600
Subject: [PATCH 08/10] mark all returns

---
 css/elements.css                              |  5 +++--
 src/Algorithm.ts                              | 20 +------------------
 src/utils.ts                                  |  5 +++--
 .../generated-reference/abstract-methods.html |  6 +++---
 .../generated-reference/algorithms.html       |  2 +-
 .../generated-reference/assets-inline.html    |  5 +++--
 .../generated-reference/effect-user-code.html |  6 +++---
 .../generated-reference/emd-in-grammar.html   |  2 +-
 test/baselines/generated-reference/eqn.html   |  4 ++--
 .../nonterminal-used-before-definition.html   |  2 +-
 .../structured-headers.html                   | 10 +++++-----
 test/baselines/generated-reference/xref.html  |  2 +-
 12 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/css/elements.css b/css/elements.css
index d3121ea8..19322ece 100644
--- a/css/elements.css
+++ b/css/elements.css
@@ -462,7 +462,7 @@ emu-val {
   font-weight: bold;
 }
 
-emu-alg li.early-exit::before {
+emu-alg li.exit:not(emu-alg ol.ac-body > li:last-child):not(emu-alg > ol > li:last-child)::before {
   display: none;
   border: 2pt solid var(--annotation-foreground-color);
   font-size: small;
@@ -475,10 +475,11 @@ emu-alg li.early-exit::before {
   vertical-align: middle;
 }
 
-html.show-early-exits emu-alg li.early-exit::before {
+html.show-early-exits emu-alg li.exit:not(emu-alg ol.ac-body > li:last-child):not(emu-alg > ol > li:last-child)::before {
   display: inline-block;
 }
 
+
 /* depth 1 */
 emu-alg ol,
 /* depth 4 */
diff --git a/src/Algorithm.ts b/src/Algorithm.ts
index 5920ade6..bbbadcd6 100644
--- a/src/Algorithm.ts
+++ b/src/Algorithm.ts
@@ -83,19 +83,12 @@ export default class Algorithm extends Builder {
     // these are macros in ECMA-262 that expand to steps that include a return/throw/?
     const earlyExitMacro = /\bIfAbrupt(?:CloseIterator|CloseAsyncIterator|RejectPromise)\(/;
     const note = /^(?:NOTE|Assert): /;
-    const acRe = /\ba new Abstract Closure\b/i;
     for (const ol of node.querySelectorAll('ol')) {
-      const isTopLevel = ol.parentElement === node;
-      const isACBody =
-        !isTopLevel &&
-        ol.parentElement?.tagName === 'LI' &&
-        acRe.test(ownTextContent(ol.parentElement));
       const items = ol.children;
       for (let i = 0; i < items.length; i++) {
-        if (i === items.length - 1 && (isTopLevel || isACBody)) continue;
         const text = ownTextContent(items[i]);
         if ((earlyExitIndicator.test(text) || earlyExitMacro.test(text)) && !note.test(text)) {
-          items[i].classList.add('early-exit');
+          items[i].classList.add('exit');
         }
       }
     }
@@ -185,17 +178,6 @@ export default class Algorithm extends Builder {
   static readonly elements = ['EMU-ALG'] as const;
 }
 
-// get text content of an element excluding nested <ol> children
-function ownTextContent(el: Element): string {
-  let text = '';
-  for (const child of el.childNodes) {
-    if (child.nodeType === 3) {
-      text += child.textContent;
-    }
-  }
-  return text;
-}
-
 function getStepNumbers(item: Element) {
   const { indexOf } = Array.prototype;
   const counts = [];
diff --git a/src/utils.ts b/src/utils.ts
index 008c3d27..8dabb20c 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -349,8 +349,9 @@ export function isAbstractClosureHeader(text: string): boolean {
 export function ownTextContent(el: Element): string {
   let text = '';
   for (const child of el.childNodes) {
-    if (child.nodeType === 1 && (child as Element).tagName === 'OL') continue;
-    text += child.textContent;
+    if (child.nodeType === 3) {
+      text += child.textContent;
+    }
   }
   return text;
 }
diff --git a/test/baselines/generated-reference/abstract-methods.html b/test/baselines/generated-reference/abstract-methods.html
index 87ef9a76..d5e1221f 100644
--- a/test/baselines/generated-reference/abstract-methods.html
+++ b/test/baselines/generated-reference/abstract-methods.html
@@ -68,14 +68,14 @@ <h1><span class="secnum">1</span> Concrete Methods Definitions</h1>
     <h1><span class="secnum">1.1</span> ResolveExport ( <var>exportName</var> [ , <var>resolveSet</var> ] )</h1>
     <p>The <emu-xref aoid="ResolveExport" id="_ref_0"><a href="#abstract-resolveexport">ResolveExport</a></emu-xref> concrete method of a <emu-xref href="#sourctextmodule-record"><a href="https://tc39.es/ecma262/#sourctextmodule-record">Source Text Module Record</a></emu-xref> <var>foo</var> takes argument <var>exportName</var> (a String) and optional argument <var>resolveSet</var> (a <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref> of <emu-xref href="#sec-abstract-module-records"><a href="https://tc39.es/ecma262/#sec-abstract-module-records">Module Records</a></emu-xref>) and returns either a <emu-xref href="#sec-abstract-module-records"><a href="https://tc39.es/ecma262/#sec-abstract-module-records">Module Record</a></emu-xref> or <emu-val>null</emu-val>. It performs the following steps when called:</p>
 
-    <emu-alg><ol><li>Return <emu-const>unused</emu-const>.</li></ol></emu-alg>
+    <emu-alg><ol><li class="exit">Return <emu-const>unused</emu-const>.</li></ol></emu-alg>
   </emu-clause>
 
   <emu-clause id="sec-smr-ResolveExport" type="concrete method">
     <h1><span class="secnum">1.2</span> ResolveExport ( <var>exportName</var> [ , <var>resolveSet</var> ] )</h1>
     <p>The <emu-xref aoid="ResolveExport" id="_ref_1"><a href="#abstract-resolveexport">ResolveExport</a></emu-xref> concrete method of a Synthetic <emu-xref href="#sec-abstract-module-records"><a href="https://tc39.es/ecma262/#sec-abstract-module-records">Module Record</a></emu-xref> <var>foo</var> takes argument <var>exportName</var> (a String) and optional argument <var>resolveSet</var> (a <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref> of <emu-xref href="#sec-abstract-module-records"><a href="https://tc39.es/ecma262/#sec-abstract-module-records">Module Records</a></emu-xref>) and returns either a <emu-xref href="#sec-abstract-module-records"><a href="https://tc39.es/ecma262/#sec-abstract-module-records">Module Record</a></emu-xref> or <emu-val>null</emu-val>. It performs the following steps when called:</p>
 
-    <emu-alg><ol><li>Do something.</li><li>Return <emu-const>unused</emu-const>.</li></ol></emu-alg>
+    <emu-alg><ol><li>Do something.</li><li class="exit">Return <emu-const>unused</emu-const>.</li></ol></emu-alg>
   </emu-clause>
 </emu-clause>
 
@@ -83,6 +83,6 @@ <h1><span class="secnum">1.2</span> ResolveExport ( <var>exportName</var> [ , <v
   <h1><span class="secnum">2</span> UseIt ( <var>module</var> )</h1>
   <p>The abstract operation UseIt takes argument <var>module</var> (a <emu-xref href="#sec-abstract-module-records"><a href="https://tc39.es/ecma262/#sec-abstract-module-records">Module Record</a></emu-xref>) and returns <emu-const>unused</emu-const>. It performs the following steps when called:</p>
 
-  <emu-alg><ol><li>Let <var>result</var> be <var>module</var>.<emu-xref aoid="ResolveExport" id="_ref_2"><a href="#abstract-resolveexport">ResolveExport</a></emu-xref>(<emu-val>"example"</emu-val>).</li><li>Perform <var>module</var>.<emu-xref aoid="NewName" id="_ref_3"><a href="#abstract-newname">NewName</a></emu-xref>().</li><li>Perform <var>module</var>.<emu-xref aoid="AddedMethod" id="_ref_4"><a href="#abstract-addedmethod">AddedMethod</a></emu-xref>().</li><li>Return <emu-const>unused</emu-const>.</li></ol></emu-alg>
+  <emu-alg><ol><li>Let <var>result</var> be <var>module</var>.<emu-xref aoid="ResolveExport" id="_ref_2"><a href="#abstract-resolveexport">ResolveExport</a></emu-xref>(<emu-val>"example"</emu-val>).</li><li>Perform <var>module</var>.<emu-xref aoid="NewName" id="_ref_3"><a href="#abstract-newname">NewName</a></emu-xref>().</li><li>Perform <var>module</var>.<emu-xref aoid="AddedMethod" id="_ref_4"><a href="#abstract-addedmethod">AddedMethod</a></emu-xref>().</li><li class="exit">Return <emu-const>unused</emu-const>.</li></ol></emu-alg>
 </emu-clause>
 </div></body>
\ No newline at end of file
diff --git a/test/baselines/generated-reference/algorithms.html b/test/baselines/generated-reference/algorithms.html
index 841cd1a0..ba9d53c1 100644
--- a/test/baselines/generated-reference/algorithms.html
+++ b/test/baselines/generated-reference/algorithms.html
@@ -12,7 +12,7 @@
   <li><span>Jump to the most recent link target</span><code>`</code></li>
 </ul></div><div id="spec-container">
 
-<emu-alg><ol><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in this spec: <emu-xref aoid="Internal" id="_ref_0"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in ES6: <emu-xref aoid="ReturnIfAbrupt"><a href="https://tc39.es/ecma262/#sec-returnifabrupt">ReturnIfAbrupt</a></emu-xref>(<var>completion</var>);</li><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in a biblio file: <emu-xref aoid="Biblio"><a href="http://example.com/fooSite.html#sec-biblio">Biblio</a></emu-xref>();</li><li>Unfound <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> just don't link: Unfound();</li><li>Can prefix with !&nbsp;and ?.<ol><li class="early-exit">Let <var>foo</var> be ?&nbsp;<emu-xref aoid="Internal" id="_ref_1"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Set <var>foo</var> to !&nbsp;<emu-xref aoid="Internal" id="_ref_2"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Set <var>foo</var> to !&nbsp;SDO of <var>operation</var>.</li><li>Set <var>foo</var> to !&nbsp;<var>operation</var>.<var class="field">[[MOP]]</var>().</li></ol></li><li>A <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> looks like this: <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> { <var class="field">[[Key]]</var>: 0&nbsp;}.</li><li>A <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref> looks like this: « 0, 1&nbsp;».</li></ol></emu-alg>
+<emu-alg><ol><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in this spec: <emu-xref aoid="Internal" id="_ref_0"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in ES6: <emu-xref aoid="ReturnIfAbrupt"><a href="https://tc39.es/ecma262/#sec-returnifabrupt">ReturnIfAbrupt</a></emu-xref>(<var>completion</var>);</li><li>Can call <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> in a biblio file: <emu-xref aoid="Biblio"><a href="http://example.com/fooSite.html#sec-biblio">Biblio</a></emu-xref>();</li><li>Unfound <emu-xref href="#sec-algorithm-conventions-abstract-operations"><a href="https://tc39.es/ecma262/#sec-algorithm-conventions-abstract-operations">abstract operations</a></emu-xref> just don't link: Unfound();</li><li>Can prefix with !&nbsp;and ?.<ol><li class="exit">Let <var>foo</var> be ?&nbsp;<emu-xref aoid="Internal" id="_ref_1"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Set <var>foo</var> to !&nbsp;<emu-xref aoid="Internal" id="_ref_2"><a href="#sec-internal">Internal</a></emu-xref>();</li><li>Set <var>foo</var> to !&nbsp;SDO of <var>operation</var>.</li><li>Set <var>foo</var> to !&nbsp;<var>operation</var>.<var class="field">[[MOP]]</var>().</li></ol></li><li>A <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> looks like this: <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">Record</a></emu-xref> { <var class="field">[[Key]]</var>: 0&nbsp;}.</li><li>A <emu-xref href="#sec-list-and-record-specification-type"><a href="https://tc39.es/ecma262/#sec-list-and-record-specification-type">List</a></emu-xref> looks like this: « 0, 1&nbsp;».</li></ol></emu-alg>
 
 <emu-clause id="sec-internal" aoid="Internal">
   <h1><span class="secnum">1</span> Internal Function</h1>
diff --git a/test/baselines/generated-reference/assets-inline.html b/test/baselines/generated-reference/assets-inline.html
index 14df8e38..4689f283 100644
--- a/test/baselines/generated-reference/assets-inline.html
+++ b/test/baselines/generated-reference/assets-inline.html
@@ -2082,7 +2082,7 @@
   font-weight: bold;
 }
 
-emu-alg li.early-exit::before {
+emu-alg li.exit:not(emu-alg ol.ac-body > li:last-child):not(emu-alg > ol > li:last-child)::before {
   display: none;
   border: 2pt solid var(--annotation-foreground-color);
   font-size: small;
@@ -2095,10 +2095,11 @@
   vertical-align: middle;
 }
 
-html.show-early-exits emu-alg li.early-exit::before {
+html.show-early-exits emu-alg li.exit:not(emu-alg ol.ac-body > li:last-child):not(emu-alg > ol > li:last-child)::before {
   display: inline-block;
 }
 
+
 /* depth 1 */
 emu-alg ol,
 /* depth 4 */
diff --git a/test/baselines/generated-reference/effect-user-code.html b/test/baselines/generated-reference/effect-user-code.html
index 76fbc0a0..11e6ce63 100644
--- a/test/baselines/generated-reference/effect-user-code.html
+++ b/test/baselines/generated-reference/effect-user-code.html
@@ -106,19 +106,19 @@ <h1><span class="secnum">15</span> Static Semantics: StaticTransitiveCall</h1>
 <emu-clause id="sec-rendered-meta" type="abstract operation" aoid="RenderedMeta">
   <h1><span class="secnum">16</span> RenderedMeta ( )</h1>
   <p>The abstract operation RenderedMeta takes no arguments. emu-meta tags with the effects attribute that aren't surrounding what ecmarkup recognizes as invocations are changed into span tags to be rendered. The effects list is prefixed with e- and changed into class names. It performs the following steps when called:</p>
-  <emu-alg><ol><li>Perform ?&nbsp;<span class="e-user-code"><var>O</var>.<var class="field">[[Call]]</var>()</span>.</li></ol></emu-alg>
+  <emu-alg><ol><li class="exit">Perform ?&nbsp;<span class="e-user-code"><var>O</var>.<var class="field">[[Call]]</var>()</span>.</li></ol></emu-alg>
 </emu-clause>
 
 <emu-clause id="sec-make-abstract-closure" type="abstract operation" aoid="MakeAbstractClosure">
   <h1><span class="secnum">17</span> MakeAbstractClosure ( )</h1>
   <p>The abstract operation MakeAbstractClosure takes no arguments. The user-code effect doesn't propagate through <emu-xref href="#sec-abstract-closure"><a href="https://tc39.es/ecma262/#sec-abstract-closure">Abstract Closure</a></emu-xref> boundaries by recognizing the "be a new <emu-xref href="#sec-abstract-closure"><a href="https://tc39.es/ecma262/#sec-abstract-closure">Abstract Closure</a></emu-xref>" <emu-xref href="#substring"><a href="https://tc39.es/ecma262/#substring">substring</a></emu-xref>. It performs the following steps when called:</p>
-  <emu-alg><ol><li>Let <var>closure</var> be a new <emu-xref href="#sec-abstract-closure"><a href="https://tc39.es/ecma262/#sec-abstract-closure">Abstract Closure</a></emu-xref> that captures nothing and performs the following steps when called:<ol class="ac-body"><li><emu-xref aoid="UserCode" id="_ref_13"><a href="#sec-user-code" class="e-user-code">UserCode</a></emu-xref>().</li></ol></li><li>Return <var>closure</var>.</li></ol></emu-alg>
+  <emu-alg><ol><li>Let <var>closure</var> be a new <emu-xref href="#sec-abstract-closure"><a href="https://tc39.es/ecma262/#sec-abstract-closure">Abstract Closure</a></emu-xref> that captures nothing and performs the following steps when called:<ol class="ac-body"><li><emu-xref aoid="UserCode" id="_ref_13"><a href="#sec-user-code" class="e-user-code">UserCode</a></emu-xref>().</li></ol></li><li class="exit">Return <var>closure</var>.</li></ol></emu-alg>
 </emu-clause>
 
 <emu-clause id="sec-make-special-abstract-closure" type="abstract operation" aoid="MakeJobAbstractClosure">
   <h1><span class="secnum">18</span> MakeJobAbstractClosure ( )</h1>
   <p>The abstract operation MakeJobAbstractClosure takes no arguments. The user-code effect doesn't propagate through specialized <emu-xref href="#sec-abstract-closure"><a href="https://tc39.es/ecma262/#sec-abstract-closure">Abstract Closure</a></emu-xref> boundaries by recognizing the "be a new Something <emu-xref href="#sec-abstract-closure"><a href="https://tc39.es/ecma262/#sec-abstract-closure">Abstract Closure</a></emu-xref>" <emu-xref href="#substring"><a href="https://tc39.es/ecma262/#substring">substring</a></emu-xref>. It performs the following steps when called:</p>
-  <emu-alg><ol><li>Let <var>closure</var> be a new <emu-xref href="#job"><a href="https://tc39.es/ecma262/#job">Job</a></emu-xref> <emu-xref href="#sec-abstract-closure"><a href="https://tc39.es/ecma262/#sec-abstract-closure">Abstract Closure</a></emu-xref> that captures nothing and performs the following steps when called:<ol class="ac-body"><li><emu-xref aoid="UserCode" id="_ref_14"><a href="#sec-user-code" class="e-user-code">UserCode</a></emu-xref>().</li></ol></li><li>Return <var>closure</var>.</li></ol></emu-alg>
+  <emu-alg><ol><li>Let <var>closure</var> be a new <emu-xref href="#job"><a href="https://tc39.es/ecma262/#job">Job</a></emu-xref> <emu-xref href="#sec-abstract-closure"><a href="https://tc39.es/ecma262/#sec-abstract-closure">Abstract Closure</a></emu-xref> that captures nothing and performs the following steps when called:<ol class="ac-body"><li><emu-xref aoid="UserCode" id="_ref_14"><a href="#sec-user-code" class="e-user-code">UserCode</a></emu-xref>().</li></ol></li><li class="exit">Return <var>closure</var>.</li></ol></emu-alg>
 </emu-clause>
 
 <emu-clause id="sec-call-make-abstract-closure" type="abstract operation" aoid="CallMakeAbstractClosure">
diff --git a/test/baselines/generated-reference/emd-in-grammar.html b/test/baselines/generated-reference/emd-in-grammar.html
index c616811b..bca84d39 100644
--- a/test/baselines/generated-reference/emd-in-grammar.html
+++ b/test/baselines/generated-reference/emd-in-grammar.html
@@ -31,7 +31,7 @@ <h1><span class="secnum">1.1</span> Static Semantics: AbstractOperation</h1>
     <emu-nt><a href="#prod-Bar">Bar</a></emu-nt> <emu-geq>::</emu-geq> <emu-rhs a="m1yuw_ux"><emu-t>example</emu-t></emu-rhs>
 </emu-production>
 </emu-grammar>
-    <emu-alg><ol><li>Return 0.</li></ol></emu-alg>
+    <emu-alg><ol><li class="exit">Return 0.</li></ol></emu-alg>
   </emu-clause>
 </emu-clause>
 </div></body>
\ No newline at end of file
diff --git a/test/baselines/generated-reference/eqn.html b/test/baselines/generated-reference/eqn.html
index 52dc7fd2..6389692e 100644
--- a/test/baselines/generated-reference/eqn.html
+++ b/test/baselines/generated-reference/eqn.html
@@ -15,7 +15,7 @@
 <emu-clause id="sec-example">
   <h1><span class="secnum">1</span> Header</h1>
   <p>Can refer to eqns inside paragraph text via autolinking: <emu-xref aoid="DateValue" id="_ref_0"><a href="#eqn-DateValue">DateValue</a></emu-xref>.</p>
-  <emu-alg><ol><li>Return <emu-xref aoid="Value" id="_ref_1"><a href="#sec-example">Value</a></emu-xref>(<var>val</var>);</li></ol></emu-alg>
+  <emu-alg><ol><li class="exit">Return <emu-xref aoid="Value" id="_ref_1"><a href="#sec-example">Value</a></emu-xref>(<var>val</var>);</li></ol></emu-alg>
 
   <emu-eqn aoid="Value2"><div>    Value2(<var>t</var>)</div><div>      = <emu-xref aoid="DateValue" id="_ref_2"><a href="#eqn-DateValue">DateValue</a></emu-xref>(<var>t</var>) if <emu-xref aoid="Type"><a href="https://tc39.es/ecma262/#sec-ecmascript-data-types-and-values">Type</a></emu-xref>(<var>t</var>) is string</div><div>      = <var>t</var></div></emu-eqn>
 
@@ -23,7 +23,7 @@ <h1><span class="secnum">1</span> Header</h1>
 
   <emu-eqn aoid="Value"><div>    Value(<var>t</var>)</div><div>      = <emu-xref aoid="DateValue" id="_ref_3"><a href="#eqn-DateValue">DateValue</a></emu-xref>(<var>t</var>) if <emu-xref aoid="Type"><a href="https://tc39.es/ecma262/#sec-ecmascript-data-types-and-values">Type</a></emu-xref>(<var>t</var>) is string</div><div>      = <var>t</var></div></emu-eqn>
 
-  <emu-alg><ol><li>Return <emu-xref aoid="Value" id="_ref_4"><a href="#sec-example">Value</a></emu-xref>(<var>val</var>);</li></ol></emu-alg>
+  <emu-alg><ol><li class="exit">Return <emu-xref aoid="Value" id="_ref_4"><a href="#sec-example">Value</a></emu-xref>(<var>val</var>);</li></ol></emu-alg>
 
   <p>Inline eqns are a thing, for example <emu-eqn class="inline"><emu-xref aoid="DateValue" id="_ref_5"><a href="#eqn-DateValue">DateValue</a></emu-xref>(n)</emu-eqn> or <emu-eqn class="inline">1 + 1 = 2</emu-eqn></p>
 </emu-clause>
diff --git a/test/baselines/generated-reference/nonterminal-used-before-definition.html b/test/baselines/generated-reference/nonterminal-used-before-definition.html
index 79173636..80e4d9cd 100644
--- a/test/baselines/generated-reference/nonterminal-used-before-definition.html
+++ b/test/baselines/generated-reference/nonterminal-used-before-definition.html
@@ -17,7 +17,7 @@ <h1><span class="secnum">1</span> Example SDO</h1>
     <emu-nt><a href="#prod-Example">Example</a></emu-nt> <emu-geq>:</emu-geq> <emu-rhs a="vrcuf_nw"><emu-t>foo</emu-t></emu-rhs>
 </emu-production>
 </emu-grammar>
-  <emu-alg><ol><li>Return <emu-val>false</emu-val>.</li></ol></emu-alg>
+  <emu-alg><ol><li class="exit">Return <emu-val>false</emu-val>.</li></ol></emu-alg>
 </emu-clause>
 
 <emu-clause id="sec-example-grammar">
diff --git a/test/baselines/generated-reference/structured-headers.html b/test/baselines/generated-reference/structured-headers.html
index d491d66e..aa5d92a5 100644
--- a/test/baselines/generated-reference/structured-headers.html
+++ b/test/baselines/generated-reference/structured-headers.html
@@ -70,12 +70,12 @@ <h1><span class="secnum">6.1</span> IsThis</h1>
     <emu-nt><a href="#prod-PrimaryExpression">PrimaryExpression</a></emu-nt> <emu-geq>:</emu-geq> <emu-rhs a="jo4mwtvh" id="prod-oDKnYE2s"><emu-t>this</emu-t></emu-rhs>
 </emu-production>
 </emu-grammar>
-    <emu-alg><ol><li>Return <emu-val>true</emu-val>.</li></ol></emu-alg>
+    <emu-alg><ol><li class="exit">Return <emu-val>true</emu-val>.</li></ol></emu-alg>
     <emu-grammar><emu-production name="PrimaryExpression" collapsed="">
     <emu-nt><a href="#prod-PrimaryExpression">PrimaryExpression</a></emu-nt> <emu-geq>:</emu-geq> <emu-rhs a="_ditw-4g" id="prod-_G-zA61Z"><emu-t>that</emu-t></emu-rhs>
 </emu-production>
 </emu-grammar>
-    <emu-alg><ol><li>Return <emu-val>false</emu-val>.</li></ol></emu-alg>
+    <emu-alg><ol><li class="exit">Return <emu-val>false</emu-val>.</li></ol></emu-alg>
   </emu-clause>
   <emu-clause id="sec-isthat" type="sdo" aoid="IsThat">
     <h1><span class="secnum">6.2</span> IsThat</h1>
@@ -84,12 +84,12 @@ <h1><span class="secnum">6.2</span> IsThat</h1>
     <emu-nt><a href="#prod-PrimaryExpression">PrimaryExpression</a></emu-nt> <emu-geq>:</emu-geq> <emu-rhs a="jo4mwtvh" id="prod-QDgm4qgx"><emu-t>this</emu-t></emu-rhs>
 </emu-production>
 </emu-grammar>
-    <emu-alg><ol><li>Return <emu-val>false</emu-val>.</li></ol></emu-alg>
+    <emu-alg><ol><li class="exit">Return <emu-val>false</emu-val>.</li></ol></emu-alg>
     <emu-grammar><emu-production name="PrimaryExpression" collapsed="">
     <emu-nt><a href="#prod-PrimaryExpression">PrimaryExpression</a></emu-nt> <emu-geq>:</emu-geq> <emu-rhs a="_ditw-4g" id="prod-6qiWXvFG"><emu-t>that</emu-t></emu-rhs>
 </emu-production>
 </emu-grammar>
-    <emu-alg><ol><li>Return <emu-val>true</emu-val>.</li></ol></emu-alg>
+    <emu-alg><ol><li class="exit">Return <emu-val>true</emu-val>.</li></ol></emu-alg>
   </emu-clause>
 </emu-clause>
 
@@ -102,6 +102,6 @@ <h1><span class="secnum">7</span> ExampleAO5 ( param )</h1>
 <emu-clause id="sec-example-single-line-return-type" type="abstract operation" aoid="ExampleA4">
   <h1><span class="secnum">8</span> ExampleA4 ( )</h1>
   <p>The abstract operation ExampleA4 takes no arguments and returns <emu-val>false</emu-val>. It performs the following steps when called:</p>
-  <emu-alg><ol><li>Return <emu-val>false</emu-val>.</li></ol></emu-alg>
+  <emu-alg><ol><li class="exit">Return <emu-val>false</emu-val>.</li></ol></emu-alg>
 </emu-clause>
 </div></body>
\ No newline at end of file
diff --git a/test/baselines/generated-reference/xref.html b/test/baselines/generated-reference/xref.html
index 187b52cd..32cca809 100644
--- a/test/baselines/generated-reference/xref.html
+++ b/test/baselines/generated-reference/xref.html
@@ -66,7 +66,7 @@ <h1><span class="secnum">1</span> Clause Title</h1>
 
   <emu-clause id="sec-abstract-op" aoid="AbstractOp">
     <h1><span class="secnum">1.1</span> AbstractOp</h1>
-    <emu-alg><ol><li>Return.</li></ol></emu-alg>
+    <emu-alg><ol><li class="exit">Return.</li></ol></emu-alg>
 
     <emu-example id="example-2" caption="Foo Caption"><figure><figcaption>Example 1 (Informative): Foo Caption</figcaption>
       This is an example

From 4297d9bec72aeb9f0b1ba4e644dcd524f13fe9a4 Mon Sep 17 00:00:00 2001
From: Michael Ficarra <git@michael.ficarra.me>
Date: Mon, 30 Mar 2026 18:58:15 -0600
Subject: [PATCH 09/10] add new baseline test

---
 .../generated-reference/exit-steps.html       | 26 ++++++++++++++
 test/baselines/sources/exit-steps.html        | 34 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 test/baselines/generated-reference/exit-steps.html
 create mode 100644 test/baselines/sources/exit-steps.html

diff --git a/test/baselines/generated-reference/exit-steps.html b/test/baselines/generated-reference/exit-steps.html
new file mode 100644
index 00000000..cf5be89a
--- /dev/null
+++ b/test/baselines/generated-reference/exit-steps.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<head><meta name="viewport" content="width=device-width, initial-scale=1"><meta charset="utf-8"></head><body><div id="shortcuts-help">
+<ul>
+  <li><span>Toggle shortcuts help</span><code>?</code></li>
+  <li><span>Toggle "can call user code" annotations</span><code>u</code></li>
+  <li><span>Toggle early exit annotations</span><code>e</code></li>
+
+  <li><span>Jump to search box</span><code>/</code></li>
+  <li><span>Toggle pinning of the current clause</span><code>p</code></li>
+  <li><span>Jump to the <i>n</i><sup>th</sup> pin</span><code>1-9</code></li>
+  <li><span>Jump to the 10<sup>th</sup> pin</span><code>0</code></li>
+  <li><span>Jump to the most recent link target</span><code>`</code></li>
+</ul></div><div id="spec-container">
+
+<emu-clause id="sec-marked-exits" type="abstract operation" aoid="MarkedExits">
+  <h1><span class="secnum">1</span> MarkedExits ( )</h1>
+  <p>The abstract operation MarkedExits takes no arguments. It performs the following steps when called:</p>
+  <emu-alg><ol><li class="exit">Return <emu-val>true</emu-val>.</li><li class="exit">If <var>x</var> is <emu-val>true</emu-val>, return <emu-const>unused</emu-const>.</li><li class="exit">Throw a <emu-val>TypeError</emu-val> exception.</li><li class="exit">If <var>x</var> is <emu-val>true</emu-val>, throw <var>x</var>.</li><li class="exit">Let <var>x</var> be ?&nbsp;Foo().</li><li class="exit">Perform ?&nbsp;Bar().</li><li class="exit"><emu-xref aoid="IfAbruptCloseIterator"><a href="https://tc39.es/ecma262/#sec-ifabruptcloseiterator">IfAbruptCloseIterator</a></emu-xref>(<var>x</var>, <var>iteratorRecord</var>).</li><li class="exit">IfAbruptCloseAsyncIterator(<var>x</var>, <var>iteratorRecord</var>).</li><li class="exit"><emu-xref aoid="IfAbruptRejectPromise"><a href="https://tc39.es/ecma262/#sec-ifabruptrejectpromise">IfAbruptRejectPromise</a></emu-xref>(<var>x</var>, <var>capability</var>).</li></ol></emu-alg>
+</emu-clause>
+
+<emu-clause id="sec-exempt-exits" type="abstract operation" aoid="ExemptExits">
+  <h1><span class="secnum">2</span> ExemptExits ( )</h1>
+  <p>The abstract operation ExemptExits takes no arguments. It performs the following steps when called:</p>
+  <emu-alg><ol><li>Let <var>x</var> be !&nbsp;Foo(<emu-val>"throw"</emu-val>).</li><li>Perform Bar(<emu-const>return</emu-const>).</li><li>NOTE: This step mentions return but is not marked.</li><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: This step mentions throw but is not marked.</li><li>NOTE: Even ?&nbsp;Baz() does not get marked here.</li><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: Even <emu-xref aoid="IfAbruptCloseIterator"><a href="https://tc39.es/ecma262/#sec-ifabruptcloseiterator">IfAbruptCloseIterator</a></emu-xref>(<var>x</var>, <var>y</var>) is not marked.</li></ol></emu-alg>
+</emu-clause>
+</div></body>
\ No newline at end of file
diff --git a/test/baselines/sources/exit-steps.html b/test/baselines/sources/exit-steps.html
new file mode 100644
index 00000000..4f4ce417
--- /dev/null
+++ b/test/baselines/sources/exit-steps.html
@@ -0,0 +1,34 @@
+<pre class=metadata>
+toc: false
+copyright: false
+assets: none
+</pre>
+
+<emu-clause id="sec-marked-exits" type="abstract operation">
+  <h1>MarkedExits ( )</h1>
+  <dl class="header"></dl>
+  <emu-alg>
+    1. Return *true*.
+    1. If _x_ is *true*, return ~unused~.
+    1. Throw a *TypeError* exception.
+    1. If _x_ is *true*, throw _x_.
+    1. Let _x_ be ? Foo().
+    1. Perform ? Bar().
+    1. IfAbruptCloseIterator(_x_, _iteratorRecord_).
+    1. IfAbruptCloseAsyncIterator(_x_, _iteratorRecord_).
+    1. IfAbruptRejectPromise(_x_, _capability_).
+  </emu-alg>
+</emu-clause>
+
+<emu-clause id="sec-exempt-exits" type="abstract operation">
+  <h1>ExemptExits ( )</h1>
+  <dl class="header"></dl>
+  <emu-alg>
+    1. Let _x_ be ! Foo(*"throw"*).
+    1. Perform Bar(~return~).
+    1. NOTE: This step mentions return but is not marked.
+    1. Assert: This step mentions throw but is not marked.
+    1. NOTE: Even ? Baz() does not get marked here.
+    1. Assert: Even IfAbruptCloseIterator(_x_, _y_) is not marked.
+  </emu-alg>
+</emu-clause>

From 8edb247616a96726c8a84980b9a9da04625269f7 Mon Sep 17 00:00:00 2001
From: Michael Ficarra <git@michael.ficarra.me>
Date: Mon, 30 Mar 2026 19:06:46 -0600
Subject: [PATCH 10/10] 15px

---
 css/elements.css                                      | 2 +-
 test/baselines/generated-reference/assets-inline.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/elements.css b/css/elements.css
index 19322ece..6becbebc 100644
--- a/css/elements.css
+++ b/css/elements.css
@@ -471,7 +471,7 @@ emu-alg li.exit:not(emu-alg ol.ac-body > li:last-child):not(emu-alg > ol > li:la
   background-color: var(--background-color);
   content: '⏎';
   margin-right: 0.25em;
-  line-height: 16px;
+  line-height: 15px;
   vertical-align: middle;
 }
 
diff --git a/test/baselines/generated-reference/assets-inline.html b/test/baselines/generated-reference/assets-inline.html
index 4689f283..f0f00608 100644
--- a/test/baselines/generated-reference/assets-inline.html
+++ b/test/baselines/generated-reference/assets-inline.html
@@ -2091,7 +2091,7 @@
   background-color: var(--background-color);
   content: '⏎';
   margin-right: 0.25em;
-  line-height: 16px;
+  line-height: 15px;
   vertical-align: middle;
 }