Merge branch 'issue119' into develop

This commit is contained in:
Davide P. Cervone 2012-08-28 15:26:51 -04:00
commit e3943746e9
18 changed files with 32 additions and 26 deletions

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

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

View File

@ -1288,6 +1288,9 @@ MathJax.ElementJax.mml.Augment({
type: "texatom",
inferRow: true,
texClass: MML.TEXCLASS.ORD,
Core: MML.mbase.childCore,
CoreMO: MML.mbase.childCoreMO,
isEmbellished: MML.mbase.childEmbellished,
setTeXclass: function (prev) {
this.data[0].setTeXclass();
return this.adjustTeXclass(prev);

View File

@ -1585,7 +1585,10 @@
},
HTMLzeroBBox: function () {return {h:0, d:0, w:0, lw: 0, rw:0}},
HTMLcanStretch: function (direction) {
if (this.isEmbellished()) {return this.Core().HTMLcanStretch(direction)}
if (this.isEmbellished()) {
var core = this.Core();
if (core && core !== this) {return core.HTMLcanStretch(direction)}
}
return false;
},
HTMLstretchH: function (box,W) {return this.HTMLspanElement()},
@ -1989,14 +1992,14 @@
CoreParent: function () {
var parent = this;
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;
},
CoreText: function (parent) {
if (!parent) {return ""}
if (parent.isEmbellished()) {return parent.CoreMO().data.join("")}
while (parent.isa(MML.mrow) && parent.data.length === 1 && parent.data[0])
{parent = parent.data[0]}
while ((parent.isa(MML.mrow) || parent.isa(MML.TeXAtom)) &&
parent.data.length === 1 && parent.data[0]) {parent = parent.data[0]}
if (!parent.isToken) {return ""} else {return parent.data.join("")}
},
HTMLremapChars: {