Merge pull request #1455 from mathjax/issue3550

Properly handle trailing spaces in \def. (mathjax/MathJax#3550)

Author: dpvc

testsuite/tests/input/tex/Newcommand.test.ts

@@ -222,6 +222,21 @@ describe('Newcommand', () => {
       tex2mml('\\def\\x#1{\\def\\y##1#1{[##1]}\\y} \\x\\X abc \\X')
     ).toMatchSnapshot();
   });
+
+  it('Def insignificant spaces', () => {
+    expect(tex2mml('\\def\\x  #1  {[#1]} \\x{x}')).toMatchSnapshot();
+  });
+
+  it('Def significant spaces 1', () => {
+    expectTexError('\\def\\x#1 #2{[#1,#2]} \\x{a}{b}').toBe('Runaway argument for \\x?');
+    expect(tex2mml('\\def\\x#1 #2{[#1,#2]} \\x{a} {b}')).toMatchSnapshot();
+  });
+
+  it('Def significant spaces 2', () => {
+    expectTexError('\\def\\x#1 #2 {[#1,#2]} \\x{a}{b}').toBe('Runaway argument for \\x?');
+    expectTexError('\\def\\x#1 #2 {[#1,#2]} \\x{a} {b}').toBe('Runaway argument for \\x?');
+    expect(tex2mml('\\def\\x#1 #2{[#1,#2]} \\x{a} {b} ')).toMatchSnapshot();
+  });
 });
 
 /**********************************************************************************/

testsuite/tests/input/tex/__snapshots__/Newcommand.test.ts.snap

@@ -327,6 +327,34 @@ exports[`Newcommand Def Template Matching 1`] = `
 </math>"
 `;
 
+exports[`Newcommand Def insignificant spaces 1`] = `
+"<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\def\\x  #1  {[#1]} \\x{x}" display="block">
+  <mo data-latex="[" stretchy="false">[</mo>
+  <mi data-latex="x">x</mi>
+  <mo data-latex="]" stretchy="false">]</mo>
+</math>"
+`;
+
+exports[`Newcommand Def significant spaces 1 1`] = `
+"<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\def\\x#1 #2{[#1,#2]} \\x{a} {b}" display="block">
+  <mo data-latex="[" stretchy="false">[</mo>
+  <mi data-latex="a">a</mi>
+  <mo data-latex=",">,</mo>
+  <mi data-latex="b">b</mi>
+  <mo data-latex="]" stretchy="false">]</mo>
+</math>"
+`;
+
+exports[`Newcommand Def significant spaces 2 1`] = `
+"<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\def\\x#1 #2{[#1,#2]} \\x{a} {b} " display="block">
+  <mo data-latex="[" stretchy="false">[</mo>
+  <mi data-latex="a">a</mi>
+  <mo data-latex=",">,</mo>
+  <mi data-latex="b">b</mi>
+  <mo data-latex="]" stretchy="false">]</mo>
+</math>"
+`;
+
 exports[`Newcommand Let Angle Circular 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\let\\lp\\langle\\let\\rp\\rangle\\let\\mp\\rp\\left\\lp \\frac{a}{b}\\middle\\mp c \\right\\rp" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\let\\lp\\langle\\let\\rp\\rangle\\let\\mp\\rp\\left\\lp \\frac{a}{b}\\middle\\mp c \\right\\rp">

ts/input/tex/newcommand/NewcommandUtil.ts

@@ -166,6 +166,9 @@ export const NewcommandUtil = {
           // @test Optional Brace Error
           // parser.i >= i!
           params[n] = parser.string.substring(i, parser.i);
+          if (params[n].replace(/^ +/, '') === '' && params.slice(0, n).join('') === '') {
+            return n;
+          }
         }
         if (params.length > 0) {
           // @test Def Let, Def Optional Brace