Skip to content

Commit

Permalink
Merge branch 'issue815' into v2.4-beta. Issue mathjax#815.
Browse files Browse the repository at this point in the history
  • Loading branch information
dpvc committed May 22, 2014
2 parents 6c244ce + 5538982 commit ae31979
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
7 changes: 6 additions & 1 deletion unpacked/jax/output/HTML-CSS/jax.js
Original file line number Diff line number Diff line change
Expand Up @@ -2616,6 +2616,7 @@
this.data[i].HTMLcanStretch("Horizontal"));
} else {
stretch[i] = this.data[i].HTMLcanStretch("Horizontal");
children[i].style.paddingLeft = children[i].style.paddingRight = "";
}
}
}
Expand All @@ -2630,7 +2631,11 @@
if (D == null && HW != null) {W = HW} else if (W == -HTMLCSS.BIGDIMEN) {W = WW}
for (i = WW = 0, m = this.data.length; i < m; i++) {if (this.data[i]) {
box = boxes[i];
if (stretch[i]) {box.bbox = this.data[i].HTMLstretchH(box,W).bbox}
if (stretch[i]) {
box.bbox = this.data[i].HTMLstretchH(box,W).bbox;
if (i !== this.base)
{children[i].style.paddingLeft = children[i].style.paddingRight = ""}
}
if (box.bbox.w > WW) {WW = box.bbox.w}
}}
var t = HTMLCSS.TeX.rule_thickness * this.mscale, factor = HTMLCSS.FONTDATA.TeX_factor;
Expand Down
7 changes: 5 additions & 2 deletions unpacked/jax/output/SVG/jax.js
Original file line number Diff line number Diff line change
Expand Up @@ -1840,7 +1840,7 @@
boxes[i] = this.SVGdataStretched(i,HW,D);
stretch[i] = (D != null || HW == null) && this.data[i].SVGcanStretch("Horizontal");
} else {
boxes[i] = this.data[i].toSVG();
boxes[i] = this.data[i].toSVG(); boxes[i].x = 0; delete boxes[i].X;
stretch[i] = this.data[i].SVGcanStretch("Horizontal");
}
if (boxes[i].w > WW) {WW = boxes[i].w}
Expand All @@ -1849,7 +1849,10 @@
}
if (D == null && HW != null) {W = HW} else if (W == -SVG.BIGDIMEN) {W = WW}
for (i = WW = 0, m = this.data.length; i < m; i++) {if (this.data[i]) {
if (stretch[i]) {boxes[i] = this.data[i].SVGstretchH(W)}
if (stretch[i]) {
boxes[i] = this.data[i].SVGstretchH(W);
if (i !== this.base) {boxes[i].x = 0; delete boxes[i].X}
}
if (boxes[i].w > WW) {WW = boxes[i].w}
}}
var t = SVG.TeX.rule_thickness * this.mscale;
Expand Down

0 comments on commit ae31979

Please sign in to comment.