Merge branch 'issue1359' into develop. Issue #1359.

dpvc · dpvc · commit 24a6cf7c251a · 2016-01-26T11:05:34.000-05:00
diff --git a/unpacked/jax/output/CommonHTML/jax.js b/unpacked/jax/output/CommonHTML/jax.js
@@ -2119,6 +2119,7 @@
           bbox[i] = this.CHTMLbboxFor(i); bbox[i].x = bbox[i].y = 0;
           if (this.data[i]) bbox[i].stretch = this.data[i].CHTMLcanStretch("Horizontal");
           scale = (i === this.base ? 1 : bbox[i].rscale);
+          if (i !== this.base) {delete bbox[i].L; delete bbox[i].R} // these are overriden by CSS
           W = Math.max(W,scale*(bbox[i].w + (bbox[i].L||0) + (bbox[i].R||0)));
           if (!bbox[i].stretch && W > w) w = W;
         }

Original file line number	Diff line number	Diff line change
`@@ -2119,6 +2119,7 @@`
`2119`	`2119`	`bbox[i] = this.CHTMLbboxFor(i); bbox[i].x = bbox[i].y = 0;`
`2120`	`2120`	`if (this.data[i]) bbox[i].stretch = this.data[i].CHTMLcanStretch("Horizontal");`
`2121`	`2121`	`scale = (i === this.base ? 1 : bbox[i].rscale);`
	`2122`	`+ if (i !== this.base) {delete bbox[i].L; delete bbox[i].R} // these are overriden by CSS`
`2122`	`2123`	`W = Math.max(W,scale*(bbox[i].w + (bbox[i].L\|\|0) + (bbox[i].R\|\|0)));`
`2123`	`2124`	`if (!bbox[i].stretch && W > w) w = W;`
`2124`	`2125`	`}`