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

Merge branch 'issue1326' into develop. Issue #1326.

Browse Source
This commit is contained in:
Davide P. Cervone 2015-12-05 13:45:29 -05:00
commit b231a0537c
1 changed files with 51 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@
var EVENT, TOUCH, HOVER; // filled in later var EVENT, TOUCH, HOVER; // filled in later
var STRUTHEIGHT = 1, var STRUTHEIGHT = 1,
EFUZZ = .1, // overlap needed for stretchy delimiters
HFUZZ = .025, DFUZZ = .025; // adjustments to bounding box of character boxes HFUZZ = .025, DFUZZ = .025; // adjustments to bounding box of character boxes
var STYLES = { var STYLES = {
@ -95,12 +96,7 @@
".mjx-prestack > .mjx-presup": {display:"block"}, ".mjx-prestack > .mjx-presup": {display:"block"},
".mjx-prestack > .mjx-presub": {display:"block"}, ".mjx-prestack > .mjx-presub": {display:"block"},
".mjx-delim-v > .mjx-char": {transform:"scale(1)"}, // for Firefox to get horizontal alignment better ".mjx-delim-h > .mjx-char": {display:"inline-block"},
".mjx-delim-h": {display:"block"},
".mjx-delim-h > .mjx-char": {
transform:"scale(1)",
display:"inline-block"
},
".mjx-surd": {"vertical-align":"top"}, ".mjx-surd": {"vertical-align":"top"},
@ -665,6 +661,9 @@
pxPerInch: 96, pxPerInch: 96,
em: 16, em: 16,
maxStretchyParts: 1000, // limit the number of parts allowed for
// stretchy operators. See issue 366.
FONTDEF: {}, FONTDEF: {},
TEXDEF: { TEXDEF: {
x_height: .442, x_height: .442,
@ -1009,11 +1008,11 @@
}, },
extendDelimiterV: function (node,H,delim,BBOX,font) { extendDelimiterV: function (node,H,delim,BBOX,font) {
node = CHTML.addElement(node,"mjx-delim-v"); var tmp = CHTML.Element("span"); node = CHTML.addElement(node,"mjx-delim-v"); var tmp = CHTML.Element("span");
var top, bot, mid, ext, tbox, bbox, mbox, ebox, k = 1; var top, bot, mid, ext, tbox, bbox, mbox, ebox, k = 1, c;
tbox = this.createChar(tmp,(delim.top||delim.ext),1,font); top = tmp.removeChild(tmp.firstChild); tbox = this.createChar(tmp,(delim.top||delim.ext),1,font); top = tmp.removeChild(tmp.firstChild);
bbox = this.createChar(tmp,(delim.bot||delim.ext),1,font); bot = tmp.removeChild(tmp.firstChild); bbox = this.createChar(tmp,(delim.bot||delim.ext),1,font); bot = tmp.removeChild(tmp.firstChild);
mbox = ebox = CHTML.BBOX.zero(); mbox = ebox = CHTML.BBOX.zero();
var h = tbox.h + tbox.d + bbox.h + bbox.d; var h = tbox.h + tbox.d + bbox.h + bbox.d - EFUZZ;
node.appendChild(top); node.appendChild(top);
if (delim.mid) { if (delim.mid) {
mbox = this.createChar(tmp,delim.mid,1,font); mid = tmp.removeChild(tmp.firstChild); mbox = this.createChar(tmp,delim.mid,1,font); mid = tmp.removeChild(tmp.firstChild);
@ -1022,30 +1021,27 @@
if (delim.min && H < h*delim.min) H = h*delim.min; if (delim.min && H < h*delim.min) H = h*delim.min;
if (H > h) { if (H > h) {
ebox = this.createChar(tmp,delim.ext,1,font); ext = tmp.removeChild(tmp.firstChild); ebox = this.createChar(tmp,delim.ext,1,font); ext = tmp.removeChild(tmp.firstChild);
if (delim.fullExtenders) { var eH = ebox.h + ebox.d, eh = eH - EFUZZ;
var n = Math.ceil((H-h)/(k*(ebox.h+ebox.d)*.9)); var n = Math.min(Math.ceil((H-h)/(k*eh)),this.maxStretchyParts);
H = .9*n*k*(ebox.h+ebox.d) + h; if (delim.fullExtenders) H = n*k*eh + h; else eh = (H-h)/(k*n);
} c = ebox.d + ebox.a - eH/2; // for centering of extenders
var s = 1.1*(H - h)/k + .3; // space to cover by extender ext.style.margin = ext.style.padding = "";
s /= (ebox.h+ebox.d); // scale factor; ext.style.lineHeight = CHTML.Em(eh);
this.Transform(ext, ext.style.marginBottom = CHTML.Em(c-EFUZZ/2/k);
"translateY("+CHTML.Em(-ebox.d+.25-s*ebox.a)+") scaleY("+s.toFixed(3).replace(/0+$/,"")+")", ext.style.marginTop = CHTML.Em(-c-EFUZZ/2/k);
"left "+CHTML.Em(ebox.d) var TEXT = ext.textContent, text = "\n"+TEXT;
); while (--n > 0) TEXT += text;
ext.style.paddingTop=ext.style.paddingBottom = 0; ext.firstChild.textContent = TEXT;
top.style.marginBottom = CHTML.Em((H-h)/k);
node.appendChild(ext); node.appendChild(ext);
if (delim.mid) { if (delim.mid) {
node.appendChild(mid); node.appendChild(mid);
mid.style.marginBottom = top.style.marginBottom;
node.appendChild(ext.cloneNode(true)); node.appendChild(ext.cloneNode(true));
} }
} else { } else {
H = h - .25; top.style.marginBottom = "-.25em"; c = (H-h-EFUZZ) / k;
if (delim.mid) { top.style.marginBottom = CHTML.Em(c+parseFloat(top.style.marginBottom||"0"));
node.appendChild(mid); if (delim.mid) node.appendChild(mid);
mid.style.marginBottom = "-.3em"; H -= .1; bot.style.marginTop = CHTML.Em(c+parseFloat(bot.style.marginTop||"0"));
}
} }
node.appendChild(bot); node.appendChild(bot);
var vbox = CHTML.BBOX({ var vbox = CHTML.BBOX({
@ -1064,64 +1060,62 @@
lbox = this.createChar(tmp,(delim.left||delim.rep),1,font); left = tmp.removeChild(tmp.firstChild); lbox = this.createChar(tmp,(delim.left||delim.rep),1,font); left = tmp.removeChild(tmp.firstChild);
rbox = this.createChar(tmp,(delim.right||delim.rep),1,font); right = tmp.removeChild(tmp.firstChild); rbox = this.createChar(tmp,(delim.right||delim.rep),1,font); right = tmp.removeChild(tmp.firstChild);
ebox = this.createChar(tmp,delim.rep,1,font); ext = tmp.removeChild(tmp.firstChild); ebox = this.createChar(tmp,delim.rep,1,font); ext = tmp.removeChild(tmp.firstChild);
left.style.marginLeft = CHTML.Em(-lbox.l);
right.style.marginRight = CHTML.Em(rbox.r-rbox.w);
node.appendChild(left); node.appendChild(left);
var hbox = CHTML.BBOX.zero(); var hbox = CHTML.BBOX.zero();
hbox.h = Math.max(lbox.h,rbox.h); hbox.d = Math.max(lbox.d,rbox.d); hbox.h = Math.max(lbox.h,rbox.h,ebox.h);
left.style.marginLeft = CHTML.Em(-lbox.l); left.style.marginRight = CHTML.Em(lbox.r-lbox.w); hbox.d = Math.max(lbox.D||lbox.d,rbox.D||rbox.d,ebox.D||ebox.d);
right.style.marginleft = CHTML.Em(-rbox.l); right.style.marginRight = CHTML.Em(rbox.r-rbox.w); var w = (lbox.r - lbox.l) + (rbox.r - rbox.l) - EFUZZ;
var w = (lbox.r - lbox.l) + (rbox.r - rbox.l) - .05;
if (delim.mid) { if (delim.mid) {
mbox = this.createChar(tmp,delim.mid,1,font); mbox = this.createChar(tmp,delim.mid,1,font);
mid = tmp.removeChild(tmp.firstChild); mid = tmp.removeChild(tmp.firstChild);
w += mbox.w; k = 2; mid.style.marginleft = CHTML.Em(-mbox.l); mid.style.marginRight = CHTML.Em(mbox.r-mbox.w);
w += mbox.r - mbox.l + EFUZZ; k = 2;
if (mbox.h > hbox.h) hbox.h = mbox.h; if (mbox.h > hbox.h) hbox.h = mbox.h;
if (mbox.d > hbox.d) hbox.d = mbox.d; if (mbox.d > hbox.d) hbox.d = mbox.d;
} }
if (delim.min && W < w*delim.min) W = w*delim.min; if (delim.min && W < w*delim.min) W = w*delim.min;
right.style.marginLeft = CHTML.Em((W-w-rbox.l)/k);
hbox.w = hbox.r = W; hbox.w = hbox.r = W;
if (W > w) { if (W > w) {
if (ebox.h > hbox.h) hbox.h = ebox.h; var eW = ebox.r-ebox.l, ew = eW - EFUZZ;
if (ebox.d > hbox.d) hbox.d = ebox.d; var n = Math.min(Math.ceil((W-w)/(k*ew)),this.maxStretchyParts);
var s = (W - w)/k + .2; // space to cover by extender if (delim.fullExtenders) W = n*k*ew + w; else ew = (W-w)/(k*n);
s /= (ebox.r - ebox.l); // scale factor var c = (eW - ew + EFUZZ/k) / 2; // for centering of extenders
this.Transform(ext, ext.style.marginLeft = CHTML.Em(-ebox.l-c);
"translateX("+CHTML.Em(-ebox.l-.1)+") scaleX("+s.toFixed(3).replace(/0+$/,"")+")", ext.style.marginRight = CHTML.Em(ebox.r-ebox.w+c);
CHTML.Em(ebox.l)+" center" ext.style.letterSpacing = CHTML.Em(-(ebox.w-ew));
); left.style.marginRight = CHTML.Em(lbox.r-lbox.w);
ext.style.width = 0; right.style.marginleft = CHTML.Em(-rbox.l);
var TEXT = ext.textContent, text = TEXT;
while (--n > 0) TEXT += text;
ext.firstChild.textContent = TEXT;
node.appendChild(ext); node.appendChild(ext);
if (delim.mid) { if (delim.mid) {
node.appendChild(mid); node.appendChild(mid);
mid.style.marginLeft = right.style.marginLeft;
ext2 = node.appendChild(ext.cloneNode(true)); ext2 = node.appendChild(ext.cloneNode(true));
} }
} else { } else {
if (delim.mid) { c = (W-w-EFUZZ/k) / 2;
node.appendChild(mid); left.style.marginRight = CHTML.Em(lbox.r-lbox.w+c);
mid.style.marginLeft = CHTML.Em((W-w)/k); if (delim.mid) node.appendChild(mid);
} right.style.marginLeft = CHTML.Em(-rbox.l+c);
} }
node.appendChild(right); node.appendChild(right);
if (ebox.D) ebox.d = ebox.D; this.adjustHeights([left,ext,mid,ext2,right],[lbox,ebox,mbox,ebox,rbox],hbox);
hbox.t = hbox.h; hbox.b = hbox.d; hbox.h = ebox.h; hbox.d = ebox.d;
this.adjustHeights([left,ext,mid,ext2,right],hbox);
var mt = ebox.h - hbox.t - ebox.a, mb = ebox.d - hbox.b + ebox.a;
if (mt) node.style.marginTop = CHTML.Em(mt);
if (mb) node.style.marginBottom = CHTML.Em(mb);
if (BBOX) {hbox.scale = BBOX.scale; hbox.rscale = BBOX.rscale} if (BBOX) {hbox.scale = BBOX.scale; hbox.rscale = BBOX.rscale}
return hbox; return hbox;
}, },
adjustHeights: function (nodes,bbox) { adjustHeights: function (nodes,box,bbox) {
// //
// To get alignment right in horizontal delimiters, we force all // To get alignment right in horizontal delimiters, we force all
// the elements to the same height and depth // the elements to the same height and depth
// //
var T = CHTML.Em(bbox.t), D = CHTML.Em(bbox.b); var T = bbox.h, B = bbox.d;
if (bbox.d < 0) {bbox.D = bbox.d; bbox.d = 0; D = CHTML.Em(-bbox.D+bbox.b)} if (bbox.d < 0) {B = -bbox.d; bbox.D = bbox.d; bbox.d = 0}
for (var i = 0, m = nodes.length; i < m; i++) if (nodes[i]) { for (var i = 0, m = nodes.length; i < m; i++) if (nodes[i]) {
nodes[i].style.paddingTop = T; nodes[i].style.paddingTop = CHTML.Em(T-box[i].a);
nodes[i].style.paddingBottom = D; nodes[i].style.paddingBottom = CHTML.Em(B+box[i].a);
nodes[i].style.marginTop = nodes[i].style.marginBottom = 0; nodes[i].style.marginTop = nodes[i].style.marginBottom = 0;
} }
}, },