suzanne.soy/scribble-mathjax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Davide P. Cervone 2014-04-20 14:45:54 -04:00
parent 1e8ae72201
commit 25bab8f05c
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unpacked/extensions/TeX/newcommand.js
View File

@ -85,7 +85,7 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () {
"Illegal number of parameters specified in %1",name]); "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 = []; var args = [];
for (var i = 0; i < n; i++) {args.push(this.GetArgument("\\begin{"+name+"}"))} for (var i = 0; i < n; i++) {args.push(this.GetArgument("\\begin{"+name+"}"))}
bdef = this.SubstituteArgs(args,bdef); 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; this.string = this.AddArgs(bdef,this.string.slice(this.i)); this.i = 0;
return begin; return begin;
}, },
EndEnv: function (begin,row) { EndEnv: function (begin,bdef,edef,n) {
this.string = this.AddArgs(begin.edef,this.string.slice(this.i)); this.i = 0 var end = "\\end{\\end\\"+begin.name+"}"; // special version of \end for after edef
return row; this.string = this.AddArgs(edef,end+this.string.slice(this.i)); this.i = 0;
return null;
}, },
/* /*

33
unpacked/jax/input/TeX/jax.js
View File

@ -44,7 +44,7 @@
Push: function () { Push: function () {
var i, m, item, top; var i, m, item, top;
for (i = 0, m = arguments.length; i < m; i++) { 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)} if (item instanceof MML.mbase) {item = STACKITEM.mml(item)}
item.global = this.global; item.global = this.global;
top = (this.data.length ? this.Top().checkItem(item) : true); top = (this.data.length ? this.Top().checkItem(item) : true);
@ -951,8 +951,8 @@
// LaTeX // LaTeX
begin: 'Begin', begin: 'BeginEnd',
end: 'End', end: 'BeginEnd',
newcommand: ['Extension','newcommand'], newcommand: ['Extension','newcommand'],
renewcommand: ['Extension','newcommand'], renewcommand: ['Extension','newcommand'],
@ -1713,26 +1713,31 @@
* LaTeX environments * LaTeX environments
*/ */
Begin: function (name) { BeginEnd: function (name) {
var env = this.GetArgument(name); var env = this.GetArgument(name), isEnd = false;
if (env.match(/[^a-z*]/i)) if (env.match(/^\\end\\/)) {isEnd = true; env = env.substr(5)} // special \end{} for \newenvironment environments
{TEX.Error(["InvalidEnv","Invalid environment name '%1'",env])} if (env.match(/\\/i)) {TEX.Error(["InvalidEnv","Invalid environment name '%1'",env])}
var cmd = this.envFindName(env); var cmd = this.envFindName(env);
if (!cmd) if (!cmd) {TEX.Error(["UnknownEnv","Unknown environment '%1'",env])}
{TEX.Error(["UnknownEnv","Unknown environment '%1'",env])} if (!(cmd instanceof Array)) {cmd = [cmd]}
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) { if (++this.macroCount > TEX.config.MAXMACROS) {
TEX.Error(["MaxMacroSub2", TEX.Error(["MaxMacroSub2",
"MathJax maximum substitution count exceeded; " + "MathJax maximum substitution count exceeded; " +
"is there a recursive latex environment?"]); "is there a recursive latex environment?"]);
} }
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)))} if (cmd[0] && this[cmd[0]]) {mml = this[cmd[0]].apply(this,[mml].concat(cmd.slice(2)))}
}
this.Push(mml); this.Push(mml);
}, },
End: function (name) {
this.Push(STACKITEM.end().With({name: this.GetArgument(name)}));
},
envFindName: function (name) {return TEXDEF.environment[name]}, envFindName: function (name) {return TEXDEF.environment[name]},
Equation: function (begin,row) {return row}, Equation: function (begin,row) {return row},