commit cc34c39def9463371931fe6df5d8a91b9d6f673e
parent 55b5803d0aa06b7a00cc0bb55a1d0a2456aa9c8e
Author: Frédéric Wang <fred.wang@free.fr>
Date: Thu, 30 May 2013 12:17:19 +0200
Replace nonstandard MJX-arrow class by an "updiagonalarrow" menclose notation. Fix issue #481.
Diffstat:
7 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/unpacked/extensions/TeX/cancel.js b/unpacked/extensions/TeX/cancel.js
@@ -38,7 +38,6 @@ MathJax.Extension["TeX/cancel"] = {
// The attributes allowed in \enclose{notation}[attributes]{math}
//
ALLOWED: {
- arrow: 1,
color: 1, mathcolor: 1,
background: 1, mathbackground: 1,
padding: 1,
@@ -97,7 +96,7 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () {
var value = this.ParseArg(name),
attr = this.GetBrackets(name,""),
math = this.ParseArg(name);
- var def = CANCEL.setAttributes({notation: MML.NOTATION.UPDIAGONALSTRIKE, arrow:true},attr);
+ var def = CANCEL.setAttributes({notation: MML.NOTATION.UPDIAGONALARROW},attr);
value = MML.mpadded(value).With({depth:"-.1em",height:"+.1em",voffset:".1em"});
this.Push(MML.msup(MML.menclose(math).With(def),value));
}
diff --git a/unpacked/extensions/toMathML.js b/unpacked/extensions/toMathML.js
@@ -84,7 +84,6 @@ MathJax.Hub.Register.LoadHook("[MathJax]/jax/element/mml/jax.js",function () {
}
if (this.mathvariant && this.toMathMLvariants[this.mathvariant])
{CLASS.push("MJX"+this.mathvariant)}
- if (this.arrow) {CLASS.push("MJX-arrow")}
if (this.variantForm) {CLASS.push("MJX-variant")}
if (CLASS.length) {attr.unshift('class="'+CLASS.join(" ")+'"')}
},
diff --git a/unpacked/jax/element/mml/jax.js b/unpacked/jax/element/mml/jax.js
@@ -132,6 +132,7 @@ MathJax.ElementJax.mml.Augment({
BOTTOM: "bottom",
UPDIAGONALSTRIKE: "updiagonalstrike",
DOWNDIAGONALSTRIKE: "downdiagonalstrike",
+ UPDIAGONALARROW: "updiagonalarrow",
VERTICALSTRIKE: "verticalstrike",
HORIZONTALSTRIKE: "horizontalstrike",
MADRUWB: "madruwb"
diff --git a/unpacked/jax/input/MathML/jax.js b/unpacked/jax/input/MathML/jax.js
@@ -96,7 +96,11 @@
for (var i = 0, m = CLASS.length; i < m; i++) {
if (CLASS[i].substr(0,4) === "MJX-") {
if (CLASS[i] === "MJX-arrow") {
- mml.arrow = true;
+ // This class was used in former version of MathJax to add an
+ // arrow to the updiagonalstrike notation. For backward
+ // compatibility, continue to handle this as updiagonalarrow.
+ mml.notation = mml.notation.replace(MML.NOTATION.UPDIAGONALSTRIKE,
+ MML.NOTATION.UPDIAGONALARROW);
} else if (CLASS[i] === "MJX-variant") {
mml.variantForm = true;
//
diff --git a/unpacked/jax/output/HTML-CSS/autoload/menclose.js b/unpacked/jax/output/HTML-CSS/autoload/menclose.js
@@ -52,13 +52,18 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
var frame = HTMLCSS.createFrame(stack,H+D,0,W,t,"none");
frame.id = "MathJax-frame-"+this.spanID;
HTMLCSS.addBox(stack,frame); stack.insertBefore(frame,base); // move base to above background
- var notation = MathJax.Hub.SplitList(values.notation);
var T = 0, B = 0, R = 0, L = 0, dx = 0, dy = 0; var svg, vml;
var w, h, r;
if (!values.mathcolor) {values.mathcolor = "black"} else {span.style.color = values.mathcolor}
-
- for (var i = 0, m = notation.length; i < m; i++) {
- switch (notation[i]) {
+
+ // perform some reduction e.g. eliminate duplicate notations.
+ var nl = MathJax.Hub.SplitList(values.notation), notation = {};
+ for (var i = 0, m = nl.length; i < m; i++) notation[nl[i]] = true;
+ if (notation[MML.NOTATION.UPDIAGONALARROW]) notation[MML.NOTATION.UPDIAGONALSTRIKE] = false;
+
+ for (var n in notation) {
+ if (!notation[n]) continue;
+ switch (n) {
case MML.NOTATION.BOX:
frame.style.border = SOLID; if (!HTMLCSS.msieBorderWidthBug) {T = B = L = R = t}
break;
@@ -130,16 +135,17 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
break;
case MML.NOTATION.UPDIAGONALSTRIKE:
+ case MML.NOTATION.UPDIAGONALARROW:
if (HTMLCSS.useVML) {
if (!vml) {vml = this.HTMLvml(stack,H,D,W,t,values.mathcolor)}
var line = this.HTMLvmlElement(vml,"line",{from: "0,"+this.HTMLpx(H+D-t), to: this.HTMLpx(W)+",0"});
- if (this.arrow) {
+ if (n == MML.NOTATION.UPDIAGONALARROW) {
this.HTMLvmlElement(line,"stroke",{endarrow:"classic"});
line.to = this.HTMLpx(W)+","+this.HTMLpx(t);
}
} else {
if (!svg) {svg = this.HTMLsvg(stack,H,D,W,t,values.mathcolor)}
- if (this.arrow) {
+ if (n == MML.NOTATION.UPDIAGONALARROW) {
var l = Math.sqrt(W*W + (H+D)*(H+D)), f = 1/l * 10*scale/HTMLCSS.em * t/.075;
w = W * f; h = (H+D) * f; var x = W - t/2, y = t/2;
if (y+h-.4*w < 0) {y = .4*w-h}
diff --git a/unpacked/jax/output/NativeMML/jax.js b/unpacked/jax/output/NativeMML/jax.js
@@ -493,7 +493,6 @@
}
if (this.mathvariant && this.NativeMMLvariants[this.mathvariant])
{CLASS.push("MJX"+this.mathvariant)}
- if (this.arrow) {CLASS.push("MJX-arrow")}
if (this.variantForm) {CLASS.push("MJX-variant")}
if (CLASS.length) {tag.setAttribute("class",CLASS.join(" "))}
},
diff --git a/unpacked/jax/output/SVG/autoload/menclose.js b/unpacked/jax/output/SVG/autoload/menclose.js
@@ -111,12 +111,17 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
var p = SVG.length2em(values.padding,mu,1/SVG.em) * scale; // padding for enclosure
var t = SVG.length2em(values.thickness,mu,1/SVG.em); // thickness of lines (not scaled, see issue #414)
var H = base.h+p+t, D = base.d+p+t, W = base.w+2*(p+t);
- var notation = MathJax.Hub.SplitList(values.notation);
var dx = 0, w, h, i, m, borders = [false,false,false,false];
if (!values.mathcolor) {values.mathcolor = "black"}
+
+ // perform some reduction e.g. eliminate duplicate notations.
+ var nl = MathJax.Hub.SplitList(values.notation), notation = {};
+ for (var i = 0, m = nl.length; i < m; i++) notation[nl[i]] = true;
+ if (notation[MML.NOTATION.UPDIAGONALARROW]) notation[MML.NOTATION.UPDIAGONALSTRIKE] = false;
- for (i = 0, m = notation.length; i < m; i++) {
- switch (notation[i]) {
+ for (var n in notation) {
+ if (!notation[n]) continue;
+ switch (n) {
case MML.NOTATION.BOX:
borders = [true,true,true,true];
break;
@@ -157,7 +162,8 @@ MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
break;
case MML.NOTATION.UPDIAGONALSTRIKE:
- if (this.arrow) {
+ case MML.NOTATION.UPDIAGONALARROW:
+ if (n == MML.NOTATION.UPDIAGONALARROW) {
var l = Math.sqrt(W*W + (H+D)*(H+D)), f = 1/l * 10/SVG.em * t/.075;
w = W * f; h = (H+D) * f; var x = .4*h;
svg.Add(BBOX.DLINE(H-.5*h,D,W-.5*w,t,values.mathcolor,"up"));
