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

Don't allow labels to overlap equations in CommonHTML mode. Because CommonHTML allows tables that fill 100% of the width, making this work for centered equations is sub-optimal as we have to leave space on both sides of the equation to balance the label width. Issue #596.

Browse Source
This commit is contained in:
Davide P. Cervone 2015-07-13 14:10:56 -04:00
parent d3ccf6fe89
commit a33c5d1437
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
unpacked/jax/output/CommonHTML/autoload/mtable.js
View File

@ -435,13 +435,21 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
if (indent.indentshiftfirst !== MML.INDENTSHIFT.INDENTSHIFT) indent.indentshift = indent.indentshiftfirst; if (indent.indentshiftfirst !== MML.INDENTSHIFT.INDENTSHIFT) indent.indentshift = indent.indentshiftfirst;
if (indent.indentshift === "auto") indent.indentshift = "0"; if (indent.indentshift === "auto") indent.indentshift = "0";
var shift = CHTML.length2em(indent.indentshift,CHTML.cwidth); var shift = CHTML.length2em(indent.indentshift,CHTML.cwidth);
var labelshift = CHTML.length2em(values.minlabelspacing,CHTML.cwidth); var labelspace = CHTML.length2em(values.minlabelspacing,this.defaults.minlabelspacing);
if (this.displayIndent !== "0") { var labelW = labelspace + state.W[LABEL], labelshift = 0, tw = state.R;
var dIndent = CHTML.length2em(CONFIG.displayIndent,CHTML.cwidth); var dIndent = CHTML.length2em(CONFIG.displayIndent,CHTML.cwidth);
shift += (indent.indentAlign === MML.INDENTALIGN.RIGHT ? -dIndent: dIndent); var s = (state.CALIGN[LABEL] === MML.INDENTALIGN.RIGHT ? -1 : 1);
if (indent.indentalign === MML.INDENTALIGN.CENTER) {
tw += 2 * (labelW - s*(shift + dIndent));
shift += dIndent;
} else if (state.CALIGN[LABEL] === indent.indentalign) {
if (dIndent < 0) {labelshift = s*dIndent; dIndent = 0}
shift += s*dIndent; if (labelW > s*shift) shift = s*labelW; shift += labelshift;
shift *= s; tw += shift;
} else {
tw += labelW - s*shift + dIndent;
shift -= s*dIndent; shift *= -s;
} }
if (indent.indentalign === MML.INDENTALIGN.CENTER) shift *= 2;
var margin = "margin"+(indent.indentalign === MML.INDENTALIGN.RIGHT ? "Right" : "Left");
// //
// Create boxes for table and labels // Create boxes for table and labels
// //
@ -452,16 +460,25 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
table.style.display = "inline-table"; if (!table.style.width) table.style.width = "auto"; table.style.display = "inline-table"; if (!table.style.width) table.style.width = "auto";
labels.style.verticalAlign = "top"; labels.style.verticalAlign = "top";
node.style.verticalAlign = ""; node.style.verticalAlign = "";
if (shift) table.style[margin] = CHTML.Em(shift); if (shift) {
if (indent.indentalign === MML.INDENTALIGN.CENTER) {
table.style.marginLeft = CHTML.Em(shift);
table.style.marginRight = CHTML.Em(-shift);
} else {
var margin = "margin" + (indent.indentalign === MML.INDENTALIGN.RIGHT ? "Right" : "Left");
table.style[margin] = CHTML.Em(shift);
}
}
// //
// Add labels on correct side // Add labels on correct side
// //
if (state.CALIGN[LABEL] === "left") { if (state.CALIGN[LABEL] === "left") {
node.insertBefore(labels,box); node.insertBefore(labels,box);
labels.style.marginRight = CHTML.Em(-state.W[LABEL]); labels.style.marginRight = CHTML.Em(-state.W[LABEL]-labelshift);
if (labelshift) labels.style.marginLeft = CHTML.Em(labelshift);
} else { } else {
node.appendChild(labels); node.appendChild(labels);
labels.style.marginLeft = CHTML.Em(-state.W[LABEL]); labels.style.marginLeft = CHTML.Em(-state.W[LABEL]+labelshift);
} }
// //
// Vertically align the labels with their rows // Vertically align the labels with their rows
@ -483,14 +500,10 @@ MathJax.Hub.Register.StartupHook("CommonHTML Jax Ready",function () {
T += RSPACE[i]; T += RSPACE[i];
} }
// //
// Propagage full-width equations, and reserve // Propagate full-width equations, and reserve room for equation plus label
// room for equation plus label and minlabelspacing
// //
node.style.width = this.CHTML.pwidth = "100%"; node.style.width = this.CHTML.pwidth = "100%";
var min = CHTML.length2em(values.minlabelspacing,this.defaults.minlabelspacing); this.CHTML.mwidth = CHTML.Em(tw);
var w = state.R + state.W[LABEL] + min;
if (indent.indentalign === MML.INDENTALIGN.CENTER) w += state.W[LABEL] + min;
this.CHTML.mwidth = CHTML.Em(w);
} }
}); });

2
unpacked/jax/output/CommonHTML/jax.js
View File

@ -1637,7 +1637,7 @@
shift *= CHTML.em/CHTML.outerEm; shift *= CHTML.em/CHTML.outerEm;
HUB.Insert(styles,({ HUB.Insert(styles,({
left: {marginLeft: CHTML.Em(shift)}, left: {marginLeft: CHTML.Em(shift)},
right: {marginLeft: CHTML.Em(Math.max(0,this.CHTML.w+shift)), marginRight: CHTML.Em(-shift)}, right: {marginRight: CHTML.Em(-shift)},
center: {marginLeft: CHTML.Em(shift), marginRight: CHTML.Em(-shift)} center: {marginLeft: CHTML.Em(shift), marginRight: CHTML.Em(-shift)}
})[values.indentalign]); })[values.indentalign]);
} }