From 90d4aff5fa0db20c6a0491ed449d4f0718cbefd3 Mon Sep 17 00:00:00 2001
From: "Davide P. Cervone" <dpvc@union.edu>
Date: Wed, 3 Sep 2025 09:41:03 -0400
Subject: [PATCH] Allow spaces after `@` in CD environment, as in real LaTeX. 
 (mathjax/MathJax#3425)

---
 testsuite/tests/input/tex/Amscd.test.ts | 29 +++++++++++++++++++++++++
 ts/input/tex/amscd/AmsCdMethods.ts      |  4 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/input/tex/Amscd.test.ts b/testsuite/tests/input/tex/Amscd.test.ts
index ff09abb12..bc856d815 100644
--- a/testsuite/tests/input/tex/Amscd.test.ts
+++ b/testsuite/tests/input/tex/Amscd.test.ts
@@ -752,6 +752,35 @@ describe('AmsCD', () => {
 
   /********************************************************************************/
 
+  it('Spaces', () => {
+    toXmlMatch(
+      tex2mml('\\begin{CD}A @ > x > > B \\end{CD}'),
+      `<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @ &gt; x &gt; &gt; B \\end{CD}" display="block">
+         <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex-item="{CD}" data-latex="\\begin{CD}A @ &gt; x &gt; &gt; B \\end{CD}">
+           <mtr>
+             <mtd>
+               <mi data-latex="A">A</mi>
+               <mpadded height="8.5pt" depth="2pt"></mpadded>
+             </mtd>
+             <mtd>
+               <mover>
+                 <mo minsize="2.75em">&#x2192;</mo>
+                 <mpadded width="+.67em" lspace=".33em" voffset=".1em">
+                   <mi data-latex="x">x</mi>
+                 </mpadded>
+               </mover>
+             </mtd>
+             <mtd>
+               <mi data-latex="B">B</mi>
+             </mtd>
+           </mtr>
+         </mtable>
+       </math>`
+    );
+  });
+
+  /********************************************************************************/
+
   it('Suspicious Return', () => {
     toXmlMatch(
       tex2mml('\\begin{CD}A @Ra>> BaD\\end{CD}'),
diff --git a/ts/input/tex/amscd/AmsCdMethods.ts b/ts/input/tex/amscd/AmsCdMethods.ts
index 94660fc9e..85882ab5d 100644
--- a/ts/input/tex/amscd/AmsCdMethods.ts
+++ b/ts/input/tex/amscd/AmsCdMethods.ts
@@ -64,9 +64,11 @@ const AmsCdMethods: { [key: string]: ParseMethod } = {
    * @returns {void} No value.
    */
   arrow(parser: TexParser, name: string): void {
-    const c = parser.string.charAt(parser.i);
+    const i = parser.i;
+    const c = parser.GetNext();
     if (!c.match(/[><VA.|=]/)) {
       // TODO: This return is suspicious.
+      parser.i = i;
       return Other(parser, name);
     } else {
       parser.i++;