commit 4246f20ed4d017456048d67569fe5c4350b5bb39
parent ae99be9f67b7de6c0b27bf3e74d10a484ad97202
Author: Davide P. Cervone <dpvc@union.edu>
Date: Wed, 2 Dec 2015 11:17:33 -0500
Merge branch 'issue1255' into develop. Issue #1255.
Diffstat:
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/unpacked/jax/input/TeX/jax.js b/unpacked/jax/input/TeX/jax.js
@@ -798,8 +798,8 @@
limits: ['Limits',1],
nolimits: ['Limits',0],
- overline: ['UnderOver','00AF'],
- underline: ['UnderOver','005F'],
+ overline: ['UnderOver','00AF',null,1],
+ underline: ['UnderOver','005F',null,1],
overbrace: ['UnderOver','23DE',1],
underbrace: ['UnderOver','23DF',1],
overparen: ['UnderOver','23DC'],
@@ -1428,7 +1428,7 @@
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 base = this.ParseArg(name);
if (base.Get("movablelimits")) {base.movablelimits = false}
@@ -1439,7 +1439,7 @@
var mml = MML.munderover(base,null,null);
mml.SetData(
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})}
this.Push(mml.With({subsupOK:true}));
diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js
@@ -1433,9 +1433,9 @@
this.placeBox(right,x,0,true);
span.bbox = {
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),
- 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
+ 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),
+ exactW: true
}
span.scale = scale;
span.isMultiChar = true;