www

commit 25bab8f05c26a050dc0400670bda7bd6eb5a3c19
parent 1e8ae72201b3a92d0b7da026316b60f370722468
Author: Davide P. Cervone <dpvc@union.edu>
Date:   Sun, 20 Apr 2014 14:45:54 -0400

Make \newenvironment perform the end substitution BEFORE testing if \end matches the corresponding \begin.  This allows \newcommand to use \begin and \end in the substititions.  Resolves issue #793.

Diffstat:
M
unpacked/extensions/TeX/newcommand.js
 | 
12
++++++------
M
unpacked/jax/input/TeX/jax.js
 | 
43
++++++++++++++++++++++++-------------------

2 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/unpacked/extensions/TeX/newcommand.js b/unpacked/extensions/TeX/newcommand.js
@@ -85,7 +85,7 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () {
                      "Illegal number of parameters specified in %1",name]);
         }
       }
-      this.setEnv(env,['BeginEnv','EndEnv',bdef,edef,n]);
+      this.setEnv(env,['BeginEnv',[null,'EndEnv'],bdef,edef,n]);
     },
     
     /*
@@ -208,15 +208,15 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () {
         var args = [];
         for (var i = 0; i < n; i++) {args.push(this.GetArgument("\\begin{"+name+"}"))}
         bdef = this.SubstituteArgs(args,bdef);
-        edef = this.SubstituteArgs(args,edef);
+        edef = this.SubstituteArgs([],edef); // no args, but get errors for #n in edef
       }
-      begin.edef = edef;
       this.string = this.AddArgs(bdef,this.string.slice(this.i)); this.i = 0;
       return begin;
     },
-    EndEnv: function (begin,row) {
-      this.string = this.AddArgs(begin.edef,this.string.slice(this.i)); this.i = 0
-      return row;
+    EndEnv: function (begin,bdef,edef,n) {
+      var end = "\\end{\\end\\"+begin.name+"}"; // special version of \end for after edef
+      this.string = this.AddArgs(edef,end+this.string.slice(this.i)); this.i = 0;
+      return null;
     },
     
     /*
diff --git a/unpacked/jax/input/TeX/jax.js b/unpacked/jax/input/TeX/jax.js
@@ -44,7 +44,7 @@
     Push: function () {
       var i, m, item, top;
       for (i = 0, m = arguments.length; i < m; i++) {
-        item = arguments[i];
+        item = arguments[i]; if (!item) continue;
         if (item instanceof MML.mbase) {item = STACKITEM.mml(item)}
         item.global = this.global;
         top = (this.data.length ? this.Top().checkItem(item) : true);
@@ -951,8 +951,8 @@
         
 
         //  LaTeX
-        begin:              'Begin',
-        end:                'End',
+        begin:              'BeginEnd',
+        end:                'BeginEnd',
 
         newcommand:        ['Extension','newcommand'],
         renewcommand:      ['Extension','newcommand'],
@@ -1713,26 +1713,31 @@
     *   LaTeX environments
     */
 
-    Begin: function (name) {
-      var env = this.GetArgument(name);
-      if (env.match(/[^a-z*]/i))
-        {TEX.Error(["InvalidEnv","Invalid environment name '%1'",env])}
+    BeginEnd: function (name) {
+      var env = this.GetArgument(name), isEnd = false;
+      if (env.match(/^\\end\\/)) {isEnd = true; env = env.substr(5)} // special \end{} for \newenvironment environments
+      if (env.match(/\\/i)) {TEX.Error(["InvalidEnv","Invalid environment name '%1'",env])}
       var cmd = this.envFindName(env);
-      if (!cmd)
-        {TEX.Error(["UnknownEnv","Unknown environment '%1'",env])}
-      if (++this.macroCount > TEX.config.MAXMACROS) {
-        TEX.Error(["MaxMacroSub2",
-                   "MathJax maximum substitution count exceeded; " +
-                   "is there a recursive latex environment?"]);
-      }
+      if (!cmd) {TEX.Error(["UnknownEnv","Unknown environment '%1'",env])}
       if (!(cmd instanceof Array)) {cmd = [cmd]}
-      var mml = STACKITEM.begin().With({name: env, end: cmd[1], parse:this});
-      if (cmd[0] && this[cmd[0]]) {mml = this[cmd[0]].apply(this,[mml].concat(cmd.slice(2)))}
+      var end = (cmd[1] instanceof Array ? cmd[1][0] : cmd[1]);
+      mml = STACKITEM.begin().With({name: env, end: end, parse:this});
+      if (name === "\\end") {
+        if (!isEnd && cmd[1] instanceof Array && this[cmd[1][1]]) {
+          mml = this[cmd[1][1]].apply(this,[mml].concat(cmd.slice(2)));
+        } else {
+          mml = STACKITEM.end().With({name: env});
+        }
+      } else {
+        if (++this.macroCount > TEX.config.MAXMACROS) {
+          TEX.Error(["MaxMacroSub2",
+                     "MathJax maximum substitution count exceeded; " +
+                     "is there a recursive latex environment?"]);
+        }
+        if (cmd[0] && this[cmd[0]]) {mml = this[cmd[0]].apply(this,[mml].concat(cmd.slice(2)))}
+      }
       this.Push(mml);
     },
-    End: function (name) {
-      this.Push(STACKITEM.end().With({name: this.GetArgument(name)}));
-    },
     envFindName: function (name) {return TEXDEF.environment[name]},
     
     Equation: function (begin,row) {return row},