Merge branch 'v2.1-latest' of https://github.com/dpvc/MathJax into v2.1-latest

This commit is contained in:
Davide P. Cervone 2012-10-03 19:13:19 -04:00
commit ec8b2cfe62
12 changed files with 26 additions and 18 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -168,11 +168,13 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
return better;
},
HTMLaddWidth: function (i,info,scanW) {
var span = this.data[i].HTMLspanElement();
scanW += span.bbox.w;
if (span.style.paddingLeft) {scanW += HTMLCSS.unEm(span.style.paddingLeft)}
if (span.style.paddingRight) {scanW += HTMLCSS.unEm(span.style.paddingRight)}
info.W = info.scanW = scanW; info.w = 0;
if (this.data[i]) {
var span = this.data[i].HTMLspanElement();
scanW += span.bbox.w;
if (span.style.paddingLeft) {scanW += HTMLCSS.unEm(span.style.paddingLeft)}
if (span.style.paddingRight) {scanW += HTMLCSS.unEm(span.style.paddingRight)}
info.W = info.scanW = scanW; info.w = 0;
}
return scanW;
},

View File

@ -954,7 +954,9 @@
},
createFrame: function (span,h,d,w,t,style) {
if (h < -d) {d = -h} // make sure h is above d
var T = (this.msieBorderWidthBug ? 0 : 2*t);
var T = 2*t;
if (this.msieFrameSizeBug) {if (w < T) {w = T}; if (h+d < T) {h = T-d}}
if (this.msieBorderWidthBug) {T = 0}
var H = this.Em(h+d-T), D = this.Em(-d-t), W = this.Em(w-T);
var B = this.Em(t)+" "+style;
var frame = this.addElement(span,"span",{
@ -1625,6 +1627,7 @@
},
HTMLboxChild: function (n,box) {
if (this.data[n]) {return this.data[n].toHTML(box)}
if (!box.bbox) {box.bbox = this.HTMLzeroBBox()}
return null;
},
@ -2703,6 +2706,7 @@
msieMarginScaleBug: (mode < 8), // relative margins are not scaled properly by font-size
msiePaddingWidthBug: true,
msieBorderWidthBug: quirks,
msieFrameSizeBug: (mode <= 8), // crashes if size of box isn't big enough for border
msieInlineBlockAlignBug: (!isIE8 || quirks),
msiePlaceBoxBug: (isIE8 && !quirks),
msieClipRectBug: !isIE8,

View File

@ -171,9 +171,11 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
return better;
},
SVGaddWidth: function (i,info,scanW) {
var svg = this.data[i].SVGdata;
scanW += svg.w + svg.x; if (svg.X) {scanW += svg.X}
info.W = info.scanW = scanW; info.w = 0;
if (this.data[i]) {
var svg = this.data[i].SVGdata;
scanW += svg.w + svg.x; if (svg.X) {scanW += svg.X}
info.W = info.scanW = scanW; info.w = 0;
}
return scanW;
},