suzanne.soy/scribble-math
1
0
Fork 0
Code Issues 8 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge branch 'issue729' into v2.4-beta. Issue #729.

Browse Source
This commit is contained in:
Davide P. Cervone 2014-06-01 10:25:17 -04:00
commit beeb356308
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
unpacked/jax/output/HTML-CSS/jax.js
View File

@ -1392,7 +1392,10 @@
span.style.top = this.Em(-h); span.style.top = this.Em(-h);
} else { } else {
span.style.verticalAlign = this.Em(h); span.style.verticalAlign = this.Em(h);
if (HTMLCSS.ffVerticalAlignBug) {HTMLCSS.createRule(span.parentNode,span.bbox.h,0,0)} if (HTMLCSS.ffVerticalAlignBug) {
HTMLCSS.createRule(span.parentNode,span.bbox.h,0,0);
delete span.parentNode.bbox;
}
} }
} }
}, },
@ -2934,7 +2937,7 @@
(HUB.config.root+"/").substr(0,root.length) === root) {webFonts = "otf"} (HUB.config.root+"/").substr(0,root.length) === root) {webFonts = "otf"}
} }
HTMLCSS.Augment({ HTMLCSS.Augment({
ffVerticalAlignBug: true, ffVerticalAlignBug: !browser.versionAtLeast("20.0"), // not sure when this bug was fixed
AccentBug: true, AccentBug: true,
allowWebFonts: webFonts allowWebFonts: webFonts
}); });

15
unpacked/jax/output/SVG/jax.js
View File

@ -1325,8 +1325,15 @@
}, },
SVGcanStretch: function (direction) { SVGcanStretch: function (direction) {
if (this.isEmbellished()) {return this.Core().SVGcanStretch(direction)} var can = false;
return false; if (this.isEmbellished()) {
var core = this.Core();
if (core && core !== this) {
can = core.SVGcanStretch(direction);
if (can && core.forceStretch) {this.forceStretch = true}
}
}
return can;
}, },
SVGstretchV: function (h,d) {return this.toSVG(h,d)}, SVGstretchV: function (h,d) {return this.toSVG(h,d)},
SVGstretchH: function (w) {return this.toSVG(w)}, SVGstretchH: function (w) {return this.toSVG(w)},
@ -1425,7 +1432,7 @@
CoreParent: function () { CoreParent: function () {
var parent = this; var parent = this;
while (parent && parent.isEmbellished() && while (parent && parent.isEmbellished() &&
parent.CoreMO() === this && !parent.isa(MML.math)) {parent = parent.Parent()} parent.CoreMO() === this && !parent.isa(MML.math)) {parent = parent.Parent()}
return parent; return parent;
}, },
CoreText: function (parent) { CoreText: function (parent) {
@ -1486,6 +1493,7 @@
this.SVGhandleColor(svg); this.SVGhandleColor(svg);
delete this.svg.element; delete this.svg.element;
this.SVGsaveData(svg); this.SVGsaveData(svg);
svg.stretched = true;
return svg; return svg;
}, },
SVGstretchH: function (w) { SVGstretchH: function (w) {
@ -1502,6 +1510,7 @@
this.SVGhandleColor(svg); this.SVGhandleColor(svg);
delete this.svg.element; delete this.svg.element;
this.SVGsaveData(svg); this.SVGsaveData(svg);
svg.stretched = true;
return svg; return svg;
} }
}); });