Update Safe.js to filter mathsize and not throw error for \mmlToken attributes that are filtered.

This commit is contained in:
Davide P. Cervone 2013-05-11 17:02:59 -04:00
parent 25a10d733d
commit 084385b640
2 changed files with 27 additions and 21 deletions

View File

@ -98,6 +98,17 @@
div1: document.createElement("div"), // for CSS processing
div2: document.createElement("div"),
//
// Methods called for MathML attribute processing
//
filter: {
"class": "filterClass",
id: "filterID",
fontsize: "filterFontSize",
mathsize: "filterFontSize",
style: "filterStyles"
},
//
// Filter HREF URL's
//
@ -242,9 +253,10 @@
});
HUB.Register.StartupHook("TeX Jax Ready",function () {
var TEX = MathJax.InputJax.TeX;
var TEX = MathJax.InputJax.TeX,
PARSE = TEX.Parse, METHOD = SAFE.filter;
TEX.Parse.Augment({
PARSE.Augment({
//
// Implements \require{name} with filtering
@ -258,11 +270,9 @@
//
// Controls \mmlToken attributes
//
MmlTokenAllow: {
fontsize: (ALLOW.fontsize === "all"),
id: (ALLOW.cssIDs === "all"),
"class": (ALLOW.classes === "all"),
style: (ALLOW.styles === "all")
MmlFilterAttribute: function (name,value) {
if (METHOD[name]) {value = SAFE[METHOD[name]](value)}
return value;
},
//
@ -292,15 +302,8 @@
});
HUB.Register.StartupHook("MathML Jax Ready",function () {
var PARSE = MathJax.InputJax.MathML.Parse;
var METHOD = {
href: "filterURL",
"class": "filterClass",
id: "filterID",
fontsize: "filterFontSize",
style: "filterStyles"
};
var PARSE = MathJax.InputJax.MathML.Parse,
METHOD = SAFE.filter;
//
// Filter MathML attributes

View File

@ -1441,15 +1441,18 @@
"%1 is not a recognized attribute for %2",
match[1],type]);
}
var value = match[2].replace(/^(['"])(.*)\1$/,"$2");
var value = this.MmlFilterAttribute(match[1],match[2].replace(/^(['"])(.*)\1$/,"$2"));
if (value) {
if (value.toLowerCase() === "true") {value = true}
else if (value.toLowerCase() === "false") {value = false}
def[match[1]] = value;
def.attrNames.push(match[1]);
}
attr = attr.substr(match[0].length);
}
this.Push(this.mmlToken(MML[type](data).With(def)));
},
MmlFilterAttribute: function (name,value) {return value},
MmlTokenAllow: {
fontfamily:1, fontsize:1, fontweight:1, fontstyle:1,
color:1, background:1,