commit ae3197913bc9b45d9826502f53388b15305acfe5
parent 6c244ce4ddb702f57e99c1769107d4a9c40e85db
Author: Davide P. Cervone <dpvc@union.edu>
Date: Thu, 22 May 2014 15:28:22 -0400
Merge branch 'issue815' into v2.4-beta. Issue #815.
Diffstat:
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js
@@ -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 = "";
}
}
}
@@ -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;
diff --git a/unpacked/jax/output/SVG/jax.js b/unpacked/jax/output/SVG/jax.js
@@ -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}
@@ -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;