Skip to content

Commit beeb356

Browse files
committed
Merge branch 'issue729' into v2.4-beta. Issue #729.
2 parents 87d38cd + 668585f commit beeb356

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

unpacked/jax/output/HTML-CSS/jax.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,10 @@
13921392
span.style.top = this.Em(-h);
13931393
} else {
13941394
span.style.verticalAlign = this.Em(h);
1395-
if (HTMLCSS.ffVerticalAlignBug) {HTMLCSS.createRule(span.parentNode,span.bbox.h,0,0)}
1395+
if (HTMLCSS.ffVerticalAlignBug) {
1396+
HTMLCSS.createRule(span.parentNode,span.bbox.h,0,0);
1397+
delete span.parentNode.bbox;
1398+
}
13961399
}
13971400
}
13981401
},
@@ -2934,7 +2937,7 @@
29342937
(HUB.config.root+"/").substr(0,root.length) === root) {webFonts = "otf"}
29352938
}
29362939
HTMLCSS.Augment({
2937-
ffVerticalAlignBug: true,
2940+
ffVerticalAlignBug: !browser.versionAtLeast("20.0"), // not sure when this bug was fixed
29382941
AccentBug: true,
29392942
allowWebFonts: webFonts
29402943
});

unpacked/jax/output/SVG/jax.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,8 +1325,15 @@
13251325
},
13261326

13271327
SVGcanStretch: function (direction) {
1328-
if (this.isEmbellished()) {return this.Core().SVGcanStretch(direction)}
1329-
return false;
1328+
var can = false;
1329+
if (this.isEmbellished()) {
1330+
var core = this.Core();
1331+
if (core && core !== this) {
1332+
can = core.SVGcanStretch(direction);
1333+
if (can && core.forceStretch) {this.forceStretch = true}
1334+
}
1335+
}
1336+
return can;
13301337
},
13311338
SVGstretchV: function (h,d) {return this.toSVG(h,d)},
13321339
SVGstretchH: function (w) {return this.toSVG(w)},
@@ -1425,7 +1432,7 @@
14251432
CoreParent: function () {
14261433
var parent = this;
14271434
while (parent && parent.isEmbellished() &&
1428-
parent.CoreMO() === this && !parent.isa(MML.math)) {parent = parent.Parent()}
1435+
parent.CoreMO() === this && !parent.isa(MML.math)) {parent = parent.Parent()}
14291436
return parent;
14301437
},
14311438
CoreText: function (parent) {
@@ -1486,6 +1493,7 @@
14861493
this.SVGhandleColor(svg);
14871494
delete this.svg.element;
14881495
this.SVGsaveData(svg);
1496+
svg.stretched = true;
14891497
return svg;
14901498
},
14911499
SVGstretchH: function (w) {
@@ -1502,6 +1510,7 @@
15021510
this.SVGhandleColor(svg);
15031511
delete this.svg.element;
15041512
this.SVGsaveData(svg);
1513+
svg.stretched = true;
15051514
return svg;
15061515
}
15071516
});

0 commit comments

Comments
 (0)