Skip to content

Commit 1f013d7

Browse files
committed
Merge pull request #644 from dpvc/issue523
Resolves issue #523
2 parents 6448c0c + 08ec41c commit 1f013d7

File tree

2 files changed

+29
-10
lines changed

2 files changed

+29
-10
lines changed

unpacked/jax/output/HTML-CSS/autoload/multiline.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,18 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
160160
if (this.data[i]) {
161161
if (this.data[i].HTMLbetterBreak(info,state)) {
162162
better = true; index = [i].concat(info.index); W = info.W; w = info.w;
163-
if (info.penalty === PENALTY.newline) {info.index = index; info.nest--; return true}
163+
if (info.penalty === PENALTY.newline) {
164+
info.index = index;
165+
if (info.nest) {info.nest--}
166+
return true;
167+
}
164168
}
165169
scanW = (broken ? info.scanW : this.HTMLaddWidth(i,info,scanW));
166170
}
167171
info.index = []; i++; broken = false;
168172
}
169-
info.nest--; info.index = index;
173+
if (info.nest) {info.nest--}
174+
info.index = index;
170175
if (better) {info.W = W; info.w = w}
171176
return better;
172177
},
@@ -407,13 +412,17 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
407412
if (this.data[k]) {
408413
if (this.data[k].HTMLbetterBreak(info,state)) {
409414
better = true; index = [i].concat(info.index); W = info.W; w = info.w;
410-
if (info.penalty === PENALTY.newline) {info.index = index; info.nest--; return true}
415+
if (info.penalty === PENALTY.newline) {
416+
info.index = index;
417+
if (info.nest) {info.nest--}
418+
return true}
411419
}
412420
scanW = (broken ? info.scanW : this.HTMLaddWidth(i,info,scanW));
413421
}
414422
info.index = []; i++; broken = false;
415423
}
416-
info.nest--; info.index = index;
424+
if (info.nest) {info.nest--}
425+
info.index = index;
417426
if (better) {info.W = W; info.w = w}
418427
return better;
419428
},
@@ -542,7 +551,7 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
542551
// mrows for nesting, but can leave these unbalanced.
543552
//
544553
if (values.texClass === MML.TEXCLASS.OPEN) {info.nest++}
545-
if (values.texClass === MML.TEXCLASS.CLOSE) {info.nest--}
554+
if (values.texClass === MML.TEXCLASS.CLOSE && info.nest) {info.nest--}
546555
//
547556
// Get the default penalty for this location
548557
//

unpacked/jax/output/SVG/autoload/multiline.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,18 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
163163
if (this.data[i]) {
164164
if (this.data[i].SVGbetterBreak(info,state)) {
165165
better = true; index = [i].concat(info.index); W = info.W; w = info.w;
166-
if (info.penalty === PENALTY.newline) {info.index = index; info.nest--; return true}
166+
if (info.penalty === PENALTY.newline) {
167+
info.index = index;
168+
if (info.nest) {info.nest--}
169+
return true;
170+
}
167171
}
168172
scanW = (broken ? info.scanW : this.SVGaddWidth(i,info,scanW));
169173
}
170174
info.index = []; i++; broken = false;
171175
}
172-
info.nest--; info.index = index;
176+
if (info.nest) {info.nest--}
177+
info.index = index;
173178
if (better) {info.W = W}
174179
return better;
175180
},
@@ -365,13 +370,18 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
365370
if (this.data[k]) {
366371
if (this.data[k].SVGbetterBreak(info,state)) {
367372
better = true; index = [i].concat(info.index); W = info.W; w = info.w;
368-
if (info.penalty === PENALTY.newline) {info.index = index; info.nest--; return true}
373+
if (info.penalty === PENALTY.newline) {
374+
info.index = index;
375+
if (info.nest) {info.nest--}
376+
return true;
377+
}
369378
}
370379
scanW = (broken ? info.scanW : this.SVGaddWidth(i,info,scanW));
371380
}
372381
info.index = []; i++; broken = false;
373382
}
374-
info.nest--; info.index = index;
383+
if (info.nest) {info.nest--}
384+
info.index = index;
375385
if (better) {info.W = W; info.w = w}
376386
return better;
377387
},
@@ -490,7 +500,7 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
490500
// mrows for nesting, but can leave these unbalanced.
491501
//
492502
if (values.texClass === MML.TEXCLASS.OPEN) {info.nest++}
493-
if (values.texClass === MML.TEXCLASS.CLOSE) {info.nest--}
503+
if (values.texClass === MML.TEXCLASS.CLOSE && info.nest) {info.nest--}
494504
//
495505
// Get the default penalty for this location
496506
//

0 commit comments

Comments
 (0)