Merge remote branch 'dpvc/issues66-67'
This commit is contained in:
commit
4cbc74e418
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
|
@ -27,7 +27,7 @@ MathJax.ElementJax.mml = MathJax.ElementJax({
|
|||
mimeType: "jax/mml"
|
||||
},{
|
||||
id: "mml",
|
||||
version: "1.0.1",
|
||||
version: "1.0.2",
|
||||
directory: MathJax.ElementJax.directory + "/mml",
|
||||
extensionDir: MathJax.ElementJax.extensionDir + "/mml",
|
||||
optableDir: MathJax.ElementJax.directory + "/mml/optable"
|
||||
|
@ -568,6 +568,7 @@ MathJax.ElementJax.mml.Augment({
|
|||
|
||||
MML.mtext = MML.mbase.Subclass({
|
||||
type: "mtext", isToken: TRUE,
|
||||
isSpacelike: function () {return TRUE},
|
||||
texClass: MML.TEXCLASS.ORD,
|
||||
defaults: {
|
||||
mathvariant: MML.INHERIT,
|
||||
|
@ -758,7 +759,7 @@ MathJax.ElementJax.mml.Augment({
|
|||
inheritFromMe: TRUE,
|
||||
noInherit: {
|
||||
mpadded: {width: TRUE, height: TRUE, depth: TRUE, lspace: TRUE, voffset: TRUE},
|
||||
mtable: {width: TRUE, height: TRUE, depth: TRUE}
|
||||
mtable: {width: TRUE, height: TRUE, depth: TRUE, align: TRUE}
|
||||
},
|
||||
setTeXclass: MML.mbase.setChildTeXclass
|
||||
});
|
||||
|
@ -1076,9 +1077,11 @@ MathJax.ElementJax.mml.Augment({
|
|||
actiontype: MML.ACTIONTYPE.TOGGLE,
|
||||
selection: 1
|
||||
},
|
||||
// FIXME: isEmbellished and Core should be keyed to selection
|
||||
// FIXME: should base class on selection
|
||||
setTeXclass: MML.mbase.setSeparateTeXclasses
|
||||
selected: function () {return this.data[this.Get("selection")-1] || MML.NULL},
|
||||
isEmbellished: function () {return this.selected().isEmbellished()},
|
||||
Core: function () {return this.selected().Core()},
|
||||
CoreMO: function () {return this.selected().CoreMO()},
|
||||
setTeXclass: function (prev) {return this.selected().setTeXclass(prev)}
|
||||
});
|
||||
|
||||
MML.semantics = MML.mbase.Subclass({
|
||||
|
@ -1181,6 +1184,8 @@ MathJax.ElementJax.mml.Augment({
|
|||
return this;
|
||||
}
|
||||
});
|
||||
|
||||
MML.NULL = MML.mbase().With({type:"null"});
|
||||
|
||||
var TEXCLASS = MML.TEXCLASS;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user