Merge branch 'issue1255' into develop. Issue #1255.
This commit is contained in:
commit
4246f20ed4
|
@ -798,8 +798,8 @@
|
||||||
limits: ['Limits',1],
|
limits: ['Limits',1],
|
||||||
nolimits: ['Limits',0],
|
nolimits: ['Limits',0],
|
||||||
|
|
||||||
overline: ['UnderOver','00AF'],
|
overline: ['UnderOver','00AF',null,1],
|
||||||
underline: ['UnderOver','005F'],
|
underline: ['UnderOver','005F',null,1],
|
||||||
overbrace: ['UnderOver','23DE',1],
|
overbrace: ['UnderOver','23DE',1],
|
||||||
underbrace: ['UnderOver','23DF',1],
|
underbrace: ['UnderOver','23DF',1],
|
||||||
overparen: ['UnderOver','23DC'],
|
overparen: ['UnderOver','23DC'],
|
||||||
|
@ -1428,7 +1428,7 @@
|
||||||
this.Push(MML.TeXAtom(MML.munderover(c,null,mml).With({accent: true})));
|
this.Push(MML.TeXAtom(MML.munderover(c,null,mml).With({accent: true})));
|
||||||
},
|
},
|
||||||
|
|
||||||
UnderOver: function (name,c,stack) {
|
UnderOver: function (name,c,stack,noaccent) {
|
||||||
var pos = {o: "over", u: "under"}[name.charAt(1)];
|
var pos = {o: "over", u: "under"}[name.charAt(1)];
|
||||||
var base = this.ParseArg(name);
|
var base = this.ParseArg(name);
|
||||||
if (base.Get("movablelimits")) {base.movablelimits = false}
|
if (base.Get("movablelimits")) {base.movablelimits = false}
|
||||||
|
@ -1439,7 +1439,7 @@
|
||||||
var mml = MML.munderover(base,null,null);
|
var mml = MML.munderover(base,null,null);
|
||||||
mml.SetData(
|
mml.SetData(
|
||||||
mml[pos],
|
mml[pos],
|
||||||
this.mmlToken(MML.mo(MML.entity("#x"+c)).With({stretchy:true, accent:(pos==="under")}))
|
this.mmlToken(MML.mo(MML.entity("#x"+c)).With({stretchy:true, accent:!noaccent}))
|
||||||
);
|
);
|
||||||
if (stack) {mml = MML.TeXAtom(mml).With({texClass:MML.TEXCLASS.OP, movesupsub:true})}
|
if (stack) {mml = MML.TeXAtom(mml).With({texClass:MML.TEXCLASS.OP, movesupsub:true})}
|
||||||
this.Push(mml.With({subsupOK:true}));
|
this.Push(mml.With({subsupOK:true}));
|
||||||
|
|
|
@ -1433,9 +1433,9 @@
|
||||||
this.placeBox(right,x,0,true);
|
this.placeBox(right,x,0,true);
|
||||||
span.bbox = {
|
span.bbox = {
|
||||||
w: x+right.bbox.rw, lw: 0, rw: x+right.bbox.rw,
|
w: x+right.bbox.rw, lw: 0, rw: x+right.bbox.rw,
|
||||||
H: Math.max(left.bbox.h,rep.bbox.h,right.bbox.h,mid.bbox.h),
|
h: Math.max(left.bbox.h,rep.bbox.h,right.bbox.h,mid.bbox.h),
|
||||||
D: Math.max(left.bbox.d,rep.bbox.d,right.bbox.d,mid.bbox.d),
|
d: Math.max(left.bbox.d,rep.bbox.d,right.bbox.d,mid.bbox.d),
|
||||||
h: rep.bbox.h, d: rep.bbox.d, exactW: true
|
exactW: true
|
||||||
}
|
}
|
||||||
span.scale = scale;
|
span.scale = scale;
|
||||||
span.isMultiChar = true;
|
span.isMultiChar = true;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user