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

Merge branch 'issue1233' into develop. Issue #1233.

Browse Source
This commit is contained in:
Davide P. Cervone 2015-08-11 08:36:45 -04:00
commit 5210dbd4c7
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unpacked/jax/input/MathML/jax.js
View File

@ -351,6 +351,8 @@
MML.mspace.Augment({mmlSelfClosing: true}); MML.mspace.Augment({mmlSelfClosing: true});
MML.none.Augment({mmlSelfClosing: true}); MML.none.Augment({mmlSelfClosing: true});
MML.mprescripts.Augment({mmlSelfClosing:true}); MML.mprescripts.Augment({mmlSelfClosing:true});
MML.maligngroup.Augment({mmlSelfClosing:true});
MML.malignmark.Augment({mmlSelfClosing:true});
} }
}); });

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

@ -1074,14 +1074,14 @@
var variant = this.SVGgetVariant(); var variant = this.SVGgetVariant();
var svg = this.SVG(); this.SVGgetScale(svg); var svg = this.SVG(); this.SVGgetScale(svg);
this.SVGhandleSpace(svg); this.SVGhandleSpace(svg);
for (var i = 0, m = this.data.length; i < m; i++) { for (var i = 0, m = this.data.length; i < m; i++) {
if (this.data[i]) { if (this.data[i]) {
var child = svg.Add(this.data[i].toSVG(variant,svg.scale),svg.w,0,true); var child = svg.Add(this.data[i].toSVG(variant,svg.scale),svg.w,0,true);
if (child.skew) {svg.skew = child.skew} if (child.skew) {svg.skew = child.skew}
} }
} }
svg.Clean(); var text = this.data.join(""); svg.Clean(); var text = this.data.join("");
if (svg.skew && text.length !== 1) {delete svg.skew} if (svg.skew && text.length !== 1) {delete svg.skew}
if (svg.r > svg.w && text.length === 1 && !variant.noIC) if (svg.r > svg.w && text.length === 1 && !variant.noIC)
{svg.ic = svg.r - svg.w; svg.w = svg.r} {svg.ic = svg.r - svg.w; svg.w = svg.r}
this.SVGhandleColor(svg); this.SVGhandleColor(svg);
@ -1402,6 +1402,12 @@
SVGlineBreaks: function () {return false} SVGlineBreaks: function () {return false}
},{ },{
SVGemptySVG: function () {
var svg = this.SVG();
svg.Clean();
this.SVGsaveData(svg);
return svg;
},
SVGautoload: function () { SVGautoload: function () {
var file = SVG.autoloadDir+"/"+this.type+".js"; var file = SVG.autoloadDir+"/"+this.type+".js";
HUB.RestartAfter(AJAX.Require(file)); HUB.RestartAfter(AJAX.Require(file));
@ -2142,6 +2148,14 @@
} }
}); });
//
// Make sure these don't generate output
//
MML.maligngroup.Augment({toSVG: MML.mbase.SVGemptySVG});
MML.malignmark.Augment({toSVG: MML.mbase.SVGemptySVG});
MML.mprescripts.Augment({toSVG: MML.mbase.SVGemptySVG});
MML.none.Augment({toSVG: MML.mbase.SVGemptySVG});
// //
// Loading isn't complete until the element jax is modified, // Loading isn't complete until the element jax is modified,
// but can't call loadComplete within the callback for "mml Jax Ready" // but can't call loadComplete within the callback for "mml Jax Ready"