Fix some bboxes that weren't converted when changing to the BBOX object.

This commit is contained in:
Davide P. Cervone 2015-03-16 10:44:35 -04:00
parent 1bfcea3c48
commit 930a959f71

View File

@ -813,12 +813,12 @@
} }
} }
node.appendChild(bot); node.appendChild(bot);
var BBOX = { var BBOX = CHTML.BBOX({
w: Math.max(tbox.w,ebox.w,bbox.w,mbox.w), w: Math.max(tbox.w,ebox.w,bbox.w,mbox.w),
l: Math.min(tbox.l,ebox.l,bbox.l,mbox.l), l: Math.min(tbox.l,ebox.l,bbox.l,mbox.l),
r: Math.max(tbox.r,ebox.r,bbox.r,mbox.r), r: Math.max(tbox.r,ebox.r,bbox.r,mbox.r),
h: H-bbox.d, d: bbox.d, t: H-bbox.d, b: bbox.d h: H-bbox.d, d: bbox.d, t: H-bbox.d, b: bbox.d
}; });
BBOX.offset = .5 * BBOX.w; BBOX.offset = .5 * BBOX.w;
return BBOX; return BBOX;
}, },
@ -1579,7 +1579,7 @@
node.style.width = 0; node.style.width = 0;
node.style.marginTop = CHTML.Em(h-STRUTHEIGHT); node.style.marginTop = CHTML.Em(h-STRUTHEIGHT);
node.style.padding = "0 "+CHTML.Em(w)+" "+CHTML.Em(d)+" 0"; node.style.padding = "0 "+CHTML.Em(w)+" "+CHTML.Em(d)+" 0";
var bbox = {w:w, h:h, d:d, l:0, r:w, t:h, b:d}; var bbox = CHTML.BBOX({w:w, h:h, d:d, l:0, r:w, t:h, b:d});
bbox.combine(cbox,x,y,1); bbox.combine(cbox,x,y,1);
bbox.w = w; bbox.h = h; bbox.d = d; bbox.w = w; bbox.h = h; bbox.d = d;
this.CHTML = bbox; this.CHTML = bbox;
@ -2121,7 +2121,6 @@
MML.TeXAtom.Augment({ MML.TeXAtom.Augment({
toCommonHTML: function (node) { toCommonHTML: function (node) {
// ### FIXME: handle TeX class?
node = this.CHTMLdefaultNode(node); node = this.CHTMLdefaultNode(node);
var H = this.CHTML.h, D = this.CHTML.d; var H = this.CHTML.h, D = this.CHTML.d;
for (var i = 0, m = this.data.length; i < m; i++) this.CHTMLstretchChildV(i,H,D); for (var i = 0, m = this.data.length; i < m; i++) this.CHTMLstretchChildV(i,H,D);