Merge branch 'issue1188' into develop. Issue #1188.

This commit is contained in:
Davide P. Cervone 2015-07-23 08:07:24 -04:00
commit 24f0388bda
2 changed files with 8 additions and 6 deletions

View File

@ -119,17 +119,19 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
var sup, sub, BOX = [];
var i = 1, m = this.data.length, W = 0;
for (var k = 0; k < 4; k += 2) {
while (i < m && this.data[i].type !== "mprescripts") {
while (i < m && (this.data[i]||{}).type !== "mprescripts") {
var box = [null,null,null,null];
for (var j = k; j < k+2; j++) {
if (this.data[i] && this.data[i].type !== "none") {
if (this.data[i] && this.data[i].type !== "none" && this.data[i].type !== "mprescripts") {
if (!BOX[j]) {
BOX[j] = HTMLCSS.createBox(stack); BOX[j].bbox = this.HTMLemptyBBox({});
if (W) {HTMLCSS.createBlank(BOX[j],W); BOX[j].bbox.w = BOX[j].bbox.rw = W}
}
box[j] = this.data[i].toHTML(BOX[j]);
} else {
box[j] = MathJax.HTML.Element("span",{bbox:this.HTMLemptyBBox({})});
}
i++;
if ((this.data[i]||{}).type !== "mprescripts") i++;
}
var isPre = (k === 2);
sub = BOX[k]; sup = BOX[k+1];

View File

@ -100,14 +100,14 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
var sup, sub, BOX = [];
var i = 1, m = this.data.length, W = 0;
for (var k = 0; k < 4; k += 2) {
while (i < m && this.data[i].type !== "mprescripts") {
while (i < m && (this.data[i]||{}).type !== "mprescripts") {
var box = [null,null,null,null];
for (var j = k; j < k+2; j++) {
if (this.data[i] && this.data[i].type !== "none") {
if (this.data[i] && this.data[i].type !== "none" && this.data[i].type !== "mprescripts") {
if (!BOX[j]) {BOX[j] = SVG.BBOX.G()}
box[j] = this.data[i].toSVG();
}
i++;
if ((this.data[i]||{}).type !== "mprescripts") i++;
}
var isPre = (k === 2);
if (isPre) W += Math.max((box[k]||{w:0}).w,(box[k+1]||{w:0}).w);