Merge remote-tracking branch 'dpvc/hotfix-2.5.2' into hotfix-2.5.2

dpvc · dpvc · commit 993715cc0324 · 2015-04-20T08:56:34.000-04:00
diff --git a/unpacked/jax/input/TeX/jax.js b/unpacked/jax/input/TeX/jax.js
@@ -1679,7 +1679,7 @@
         }
         var text = string.substr(this.i,i-this.i);
         if (!text.match(/^\s*\\text[^a-zA-Z]/)) {
-          this.Push.apply(this,this.InternalMath(text));
+          this.Push.apply(this,this.InternalMath(text,0));
           this.i = i;
         }
       }
@@ -2054,8 +2054,11 @@
         if (match !== '') TEX.Error(["MathNotTerminated","Math not terminated in text box"]);
       }
       if (k < text.length) mml.push(this.InternalText(text.slice(k),def));
-      var mml = [MML.mstyle.apply(MML,mml).With({displaystyle:false})];
-      if (level != null) mml[0].scriptlevel = level;
+      if (level != null) {
+        mml = [MML.mstyle.apply(MML,mml).With({displaystyle:false,scriptlevel:level})];
+      } else if (mml.length > 1) {
+        mml = [MML.mrow.apply(MML,mml)];
+      }
       return mml;
     },
     InternalText: function (text,def) {

Original file line number	Diff line number	Diff line change
`@@ -1679,7 +1679,7 @@`
`1679`	`1679`	`}`
`1680`	`1680`	`var text = string.substr(this.i,i-this.i);`
`1681`	`1681`	`if (!text.match(/^\s*\\text[^a-zA-Z]/)) {`
`1682`		`- this.Push.apply(this,this.InternalMath(text));`
	`1682`	`+ this.Push.apply(this,this.InternalMath(text,0));`
`1683`	`1683`	`this.i = i;`
`1684`	`1684`	`}`
`1685`	`1685`	`}`
`@@ -2054,8 +2054,11 @@`
`2054`	`2054`	`if (match !== '') TEX.Error(["MathNotTerminated","Math not terminated in text box"]);`
`2055`	`2055`	`}`
`2056`	`2056`	`if (k < text.length) mml.push(this.InternalText(text.slice(k),def));`
`2057`		`- var mml = [MML.mstyle.apply(MML,mml).With({displaystyle:false})];`
`2058`		`- if (level != null) mml[0].scriptlevel = level;`
	`2057`	`+ if (level != null) {`
	`2058`	`+ mml = [MML.mstyle.apply(MML,mml).With({displaystyle:false,scriptlevel:level})];`
	`2059`	`+ } else if (mml.length > 1) {`
	`2060`	`+ mml = [MML.mrow.apply(MML,mml)];`
	`2061`	`+ }`
`2059`	`2062`	`return mml;`
`2060`	`2063`	`},`
`2061`	`2064`	`InternalText: function (text,def) {`