diff --git a/jax/output/HTML-CSS/autoload/menclose.js b/jax/output/HTML-CSS/autoload/menclose.js index 0386381e0..2bb3e95a4 100644 --- a/jax/output/HTML-CSS/autoload/menclose.js +++ b/jax/output/HTML-CSS/autoload/menclose.js @@ -12,5 +12,5 @@ * http://www.apache.org/licenses/LICENSE-2.0 */ -MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function(){var d="1.1.2";var a=MathJax.ElementJax.mml,b=MathJax.OutputJax["HTML-CSS"];var c="http://www.w3.org/2000/svg";var f="urn:schemas-microsoft-com:vml";var e="mjxvml";a.menclose.Augment({toHTML:function(S){var j=this.getValues("notation","thickness","padding","mathcolor","color");if(j.color&&!this.mathcolor){j.mathcolor=j.color}if(j.thickness==null){j.thickness=".075em"}if(j.padding==null){j.padding=".2em"}var M=this.HTMLgetMu(S);var N=b.length2em(j.padding,M);var E=b.length2em(j.thickness,M);var x=b.Em(E)+" solid";S=this.HTMLcreateSpan(S);var u=b.createStack(S);var q=b.createBox(u);this.HTMLmeasureChild(0,q);var A=q.bbox.h+N+E,G=q.bbox.d+N+E,k=q.bbox.w+2*(N+E);var F=b.createFrame(u,A+G,0,k,E,"none");F.id="MathJax-frame-"+this.spanID;b.addBox(u,F);u.insertBefore(F,q);var l=j.notation.split(/ /);var n=0,K=0,o=0,v=0,C=0,z=0;var J,g;if(!j.mathcolor){j.mathcolor="black"}else{S.style.color=j.mathcolor}for(var Q=0,P=l.length;Q=8){document.namespaces.add(e,f,"#default#VML")}else{document.namespaces.add(e,f);document.createStyleSheet().addRule(e+"\\: *","{behavior: url(#default#VML)}")}}}});MathJax.Hub.Startup.signal.Post("HTML-CSS menclose Ready");MathJax.Ajax.loadComplete(b.autoloadDir+"/menclose.js")}); +MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function(){var d="1.1.2";var a=MathJax.ElementJax.mml,b=MathJax.OutputJax["HTML-CSS"];var c="http://www.w3.org/2000/svg";var f="urn:schemas-microsoft-com:vml";var e="mjxvml";a.menclose.Augment({toHTML:function(ab){var j=this.getValues("notation","thickness","padding","mathcolor","color");if(j.color&&!this.mathcolor){j.mathcolor=j.color}if(j.thickness==null){j.thickness=".075em"}if(j.padding==null){j.padding=".2em"}var U=this.HTMLgetMu(ab),ad=this.HTMLgetScale();var V=b.length2em(j.padding,U)*ad;var M=b.length2em(j.thickness,U)*ad;var C=b.Em(M)+" solid";ab=this.HTMLcreateSpan(ab);var v=b.createStack(ab);var s=b.createBox(v);this.HTMLmeasureChild(0,s);var J=s.bbox.h+V+M,O=s.bbox.d+V+M,k=s.bbox.w+2*(V+M);var N=b.createFrame(v,J+O,0,k,M,"none");N.id="MathJax-frame-"+this.spanID;b.addBox(v,N);v.insertBefore(N,s);var n=j.notation.split(/ /);var o=0,S=0,q=0,z=0,K=0,I=0;var Q,g;var G,ac,P;if(!j.mathcolor){j.mathcolor="black"}else{ab.style.color=j.mathcolor}for(var aa=0,Y=n.length;aa=8){document.namespaces.add(e,f,"#default#VML")}else{document.namespaces.add(e,f);document.createStyleSheet().addRule(e+"\\: *","{behavior: url(#default#VML)}")}}}});MathJax.Hub.Startup.signal.Post("HTML-CSS menclose Ready");MathJax.Ajax.loadComplete(b.autoloadDir+"/menclose.js")}); diff --git a/unpacked/jax/output/HTML-CSS/autoload/menclose.js b/unpacked/jax/output/HTML-CSS/autoload/menclose.js index 06e25f036..409b775c6 100644 --- a/unpacked/jax/output/HTML-CSS/autoload/menclose.js +++ b/unpacked/jax/output/HTML-CSS/autoload/menclose.js @@ -36,9 +36,9 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () { if (values.color && !this.mathcolor) {values.mathcolor = values.color} if (values.thickness == null) {values.thickness = ".075em"} if (values.padding == null) {values.padding = ".2em"} - var mu = this.HTMLgetMu(span); - var p = HTMLCSS.length2em(values.padding,mu); - var t = HTMLCSS.length2em(values.thickness,mu); + var mu = this.HTMLgetMu(span), scale = this.HTMLgetScale(); + var p = HTMLCSS.length2em(values.padding,mu) * scale; + var t = HTMLCSS.length2em(values.thickness,mu) * scale; var SOLID = HTMLCSS.Em(t)+" solid"; span = this.HTMLcreateSpan(span); @@ -51,6 +51,7 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () { HTMLCSS.addBox(stack,frame); stack.insertBefore(frame,base); // move base to above background var notation = values.notation.split(/ /); 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++) { @@ -63,8 +64,8 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () { if (HTMLCSS.useVML) { if (!vml) {vml = this.HTMLvml(stack,H,D,W,t,values.mathcolor)} // roundrect.arcsize can't be set in IE8 standards mode, so use a path - var r = Math.floor(1000*Math.min(W,H+D)-2*t); - var w = Math.floor(4000*(W-2*t)), h = Math.floor(4000*(H+D-2*t)); + r = Math.floor(1000*Math.min(W,H+D)-2*t); + w = Math.floor(4000*(W-2*t)), h = Math.floor(4000*(H+D-2*t)); this.HTMLvmlElement(vml,"shape",{ style: {width:this.HTMLpx(W-2*t),height:this.HTMLpx(H+D-2*t), left:this.HTMLpx(t,.5),top:this.HTMLpx(t,.5)}, @@ -128,12 +129,33 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () { case MML.NOTATION.UPDIAGONALSTRIKE: if (HTMLCSS.useVML) { if (!vml) {vml = this.HTMLvml(stack,H,D,W,t,values.mathcolor)} - this.HTMLvmlElement(vml,"line",{from: "0,"+this.HTMLpx(H+D-t), to: this.HTMLpx(W)+",0"}); + var line = this.HTMLvmlElement(vml,"line",{from: "0,"+this.HTMLpx(H+D-t), to: this.HTMLpx(W)+",0"}); + if (this.arrow) { + 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)} - this.HTMLsvgElement(svg.firstChild,"line",{ - x1:1, y1:this.HTMLpx(H+D-t), x2:this.HTMLpx(W-t), y2:this.HTMLpx(t) - }); + if (this.arrow) { + var l = Math.sqrt(W*W + (H+D)*(H+D)); + w = W/l * 10*scale/HTMLCSS.em, h = (H+D)/l * 10*scale/HTMLCSS.em; + var x = W - t/2, y = t/2; if (y+h-.4*w < 0) {y = .4*w-h} + this.HTMLsvgElement(svg.firstChild,"line",{ + x1:1, y1:this.HTMLpx(H+D-t), x2:this.HTMLpx(x-.7*w), y2:this.HTMLpx(y+.7*h) + }); + this.HTMLsvgElement(svg.firstChild,"polygon",{ + points: this.HTMLpx(x)+","+this.HTMLpx(y)+" " + +this.HTMLpx(x-w-.4*h)+","+this.HTMLpx(y+h-.4*w)+" " + +this.HTMLpx(x-.7*w)+","+this.HTMLpx(y+.7*h)+" " + +this.HTMLpx(x-w+.4*h)+","+this.HTMLpx(y+h+.4*w)+" " + +this.HTMLpx(x)+","+this.HTMLpx(y), + fill:values.mathcolor, stroke:"none" + }); + } else { + this.HTMLsvgElement(svg.firstChild,"line",{ + x1:1, y1:this.HTMLpx(H+D-t), x2:this.HTMLpx(W-t), y2:this.HTMLpx(t) + }); + } } break; @@ -251,6 +273,7 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () { if (!def.fillcolor) {obj.fillcolor = "none"} if (!def.strokecolor) {obj.strokecolor = this.constructor.VMLcolor} if (!def.strokeweight) {obj.strokeweight =this.constructor.VMLthickness} + return obj; } });