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

Put off moving math in containers with display:none from the hidden div where they are typeset to their proper locations until AFTER they have been remeasured. Resolves issue #1179.

Browse Source
This commit is contained in:
Davide P. Cervone 2015-04-30 13:44:03 -04:00
parent 9995bf3fda
commit 242c9356f5
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
unpacked/jax/output/HTML-CSS/jax.js
View File

@ -539,7 +539,7 @@
}, },
preTranslate: function (state) { preTranslate: function (state) {
var scripts = state.jax[this.id], i, m = scripts.length, var scripts = state.jax[this.id], i, m = scripts.length, n,
script, prev, span, div, test, jax, ex, em, scale, maxwidth, relwidth = false, cwidth, script, prev, span, div, test, jax, ex, em, scale, maxwidth, relwidth = false, cwidth,
linebreak = this.config.linebreaks.automatic, width = this.config.linebreaks.width; linebreak = this.config.linebreaks.automatic, width = this.config.linebreaks.width;
if (linebreak) { if (linebreak) {
@ -590,7 +590,10 @@
// //
// Determine the scaling factors for each script // Determine the scaling factors for each script
// (this only requires one reflow rather than a reflow for each equation) // (this only requires one reflow rather than a reflow for each equation)
// Record any that need to be hidden (don't move them now, since that
// would cause reflows).
// //
var hidden = [];
for (i = 0; i < m; i++) { for (i = 0; i < m; i++) {
script = scripts[i]; if (!script.parentNode) continue; script = scripts[i]; if (!script.parentNode) continue;
test = script.previousSibling; div = test.previousSibling; test = script.previousSibling; div = test.previousSibling;
@ -601,8 +604,7 @@
if (relwidth) {maxwidth = cwidth} if (relwidth) {maxwidth = cwidth}
if (ex === 0 || ex === "NaN") { if (ex === 0 || ex === "NaN") {
// can't read width, so move to hidden div for processing // can't read width, so move to hidden div for processing
// (this will cause a reflow for each math element that is hidden) hidden.push(div);
this.hiddenDiv.appendChild(div);
jax.HTMLCSS.isHidden = true; jax.HTMLCSS.isHidden = true;
ex = this.defaultEx; em = this.defaultEm; cwidth = this.defaultWidth; ex = this.defaultEx; em = this.defaultEm; cwidth = this.defaultWidth;
if (relwidth) {maxwidth = cwidth} if (relwidth) {maxwidth = cwidth}
@ -614,6 +616,10 @@
jax.HTMLCSS.cwidth = cwidth/this.em; jax.HTMLCSS.cwidth = cwidth/this.em;
jax.HTMLCSS.lineWidth = (linebreak ? this.length2em(width,1,maxwidth/this.em) : 1000000); jax.HTMLCSS.lineWidth = (linebreak ? this.length2em(width,1,maxwidth/this.em) : 1000000);
} }
for (i = 0, n = hidden.length; i < n; i++) {
this.hiddenDiv.appendChild(hidden[i]);
this.addElement(this.hiddenDiv,"br");
}
// //
// Remove the test spans used for determining scales and linebreak widths // Remove the test spans used for determining scales and linebreak widths
// //
@ -676,9 +682,8 @@
} }
this.restorePreview(script); this.restorePreview(script);
// //
// Put it in place, remove the processing marker, and signal the new math // Remove the processing marker, and signal the new math pending
// //
if (jax.HTMLCSS.isHidden) {script.parentNode.insertBefore(div,script)}
div.className = div.className.split(/ /)[0] + " MathJax_Processed"; div.className = div.className.split(/ /)[0] + " MathJax_Processed";
HUB.signal.Post(["New Math Pending",jax.inputID]); // FIXME: wait for this? (i.e., restart if returns uncalled callback) HUB.signal.Post(["New Math Pending",jax.inputID]); // FIXME: wait for this? (i.e., restart if returns uncalled callback)
// //
@ -732,7 +737,8 @@
for (i = state.HTMLCSSlast, m = state.HTMLCSSeqn; i < m; i++) { for (i = state.HTMLCSSlast, m = state.HTMLCSSeqn; i < m; i++) {
script = scripts[i]; script = scripts[i];
if (script && script.MathJax.elementJax) { if (script && script.MathJax.elementJax) {
script.previousSibling.className = script.previousSibling.className.split(/ /)[0]; var div = script.MathJax.elementJax.HTMLCSS.div;
div.className = div.className.split(/ /)[0];
if (script.MathJax.preview) {script.MathJax.preview.innerHTML = ""} if (script.MathJax.preview) {script.MathJax.preview.innerHTML = ""}
} }
} }
@ -757,6 +763,7 @@
// //
jax = script.MathJax.elementJax; this.getMetrics(jax); jax = script.MathJax.elementJax; this.getMetrics(jax);
jax.root.toHTML(jax.HTMLCSS.span,jax.HTMLCSS.div,this.PHASE.III); jax.root.toHTML(jax.HTMLCSS.span,jax.HTMLCSS.div,this.PHASE.III);
if (jax.HTMLCSS.isHidden) script.parentNode.insertBefore(jax.HTMLCSS.div,script);
delete jax.HTMLCSS.span; delete jax.HTMLCSS.div; delete jax.HTMLCSS.span; delete jax.HTMLCSS.div;
// //
// The math is now fully processed // The math is now fully processed