From 0e2399dc4a1a6f96431e82318f24f0535e80a5b3 Mon Sep 17 00:00:00 2001 From: Dmitry Baranovskiy Date: Fri, 4 Dec 2009 09:49:55 +1100 Subject: [PATCH] 1.2.5 Fixed bbox for curves. It was wrong in some cases. --- raphael-min.js | 4 +- raphael.js | 115 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 42 deletions(-) diff --git a/raphael-min.js b/raphael-min.js index 6258e6a..16a511d 100644 --- a/raphael-min.js +++ b/raphael-min.js @@ -1,7 +1,7 @@ /* - * Raphael 1.2.4 - JavaScript Vector Library + * Raphael 1.2.5 - JavaScript Vector Library * * Copyright (c) 2008 - 2009 Dmitry Baranovskiy (http://raphaeljs.com) * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license. */ -window.Raphael=(function(){var a=/[, ]+/,D=document,aj=window,k={was:"Raphael" in aj,is:aj.Raphael},af=function(){if(af.is(arguments[0],"array")){var e=arguments[0],E=s[aI](af,e.splice(0,3+af.is(e[0],ad))),aM=E.set();for(var S=0,aN=e[l];S");i.close();aN=i.body;}catch(aP){aN=createPopup().document.body;}var S=aN.createTextRange();try{aN.style.color=aM;var aO=S.queryCommandValue("ForeColor");aO=((aO&255)<<16)|(aO&65280)|((aO&16711680)>>>16);return"#"+("000000"+aO[ao](16)).slice(-6);}catch(aP){return"none";}});}else{var R=D.createElement("i");R.className="Rapha\xebl Colour Picker";R.style.cssText="display:none";D.body[az](R);aq=aa(function(i){R.style.color=i;return D.defaultView.getComputedStyle(R,ai).getPropertyValue("color");});}return aq(E);};af.hsb2rgb=aa(function(aQ,aO,aU){if(af.is(aQ,"object")&&"h" in aQ&&"s" in aQ&&"b" in aQ){aU=aQ.b;aO=aQ.s;aQ=aQ.h;}var S,aM,aV;if(aU==0){return{r:0,g:0,b:0,hex:"#000"};}if(aQ>1||aO>1||aU>1){aQ/=255;aO/=255;aU/=255;}var aN=~~(aQ*6),aR=(aQ*6)-aN,R=aU*(1-aO),E=aU*(1-(aO*aR)),aW=aU*(1-(aO*(1-aR)));S=[aU,E,R,R,aW,aU,aU][aN];aM=[aW,aU,aU,E,R,R,aW][aN];aV=[R,R,aW,aU,aU,E,R][aN];S*=255;aM*=255;aV*=255;var aS={r:S,g:aM,b:aV},e=(~~S)[ao](16),aP=(~~aM)[ao](16),aT=(~~aV)[ao](16);e=e[aC](aG,"0");aP=aP[aC](aG,"0");aT=aT[aC](aG,"0");aS.hex="#"+e+aP+aT;return aS;},af);af.rgb2hsb=aa(function(e,i,aO){if(af.is(e,"object")&&"r" in e&&"g" in e&&"b" in e){aO=e.b;i=e.g;e=e.r;}if(af.is(e,"string")){var aQ=af.getRGB(e);e=aQ.r;i=aQ.g;aO=aQ.b;}if(e>1||i>1||aO>1){e/=255;i/=255;aO/=255;}var aN=f(e,i,aO),E=aw(e,i,aO),S,R,aM=aN;if(E==aN){return{h:0,s:0,b:aN};}else{var aP=(aN-E);R=aP/aN;if(e==aN){S=(i-aO)/aP;}else{if(i==aN){S=2+((aO-e)/aP);}else{S=4+((e-i)/aP);}}S/=6;S<0&&S++;S>1&&S--;}return{h:S,s:R,b:aM};},af);var ar=/,?([achlmqrstvxz]),?/gi;af._path2string=function(){return this.join(",")[aC](ar,"$1");};function aa(R,i,e){function E(){var S=Array[aK].slice.call(arguments,0),aN=S[an]("\u25ba"),aM=E.cache=E.cache||{},aO=E.count=E.count||[];if(aM[J](aN)){return e?e(aM[aN]):aM[aN];}aO[l]>=1000&&delete aM[aO.shift()];aO[d](aN);aM[aN]=R[aI](i,S);return e?e(aM[aN]):aM[aN];}return E;}af.getRGB=aa(function(e){if(!e||!!((e+ai).indexOf("-")+1)){return{r:-1,g:-1,b:-1,hex:"none",error:1};}e=e+ai;if(e=="none"){return{r:-1,g:-1,b:-1,hex:"none"};}!({hs:1,rg:1})[J](e.substring(0,2))&&(e=aq(e));var aM,E,R,aP,aN=e.match(/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb$\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*$|rgb$\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*$|hs[bl]$\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*$|hs[bl]$\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*$)\s*$/i);if(aN){if(aN[2]){aP=z(aN[2].substring(5),16);R=z(aN[2].substring(3,5),16);E=z(aN[2].substring(1,3),16);}if(aN[3]){aP=z(aN[3].substring(3)+aN[3].substring(3),16);R=z(aN[3].substring(2,3)+aN[3].substring(2,3),16);E=z(aN[3].substring(1,2)+aN[3].substring(1,2),16);}if(aN[4]){aN=aN[4][u](/\s*,\s*/);E=N(aN[0]);R=N(aN[1]);aP=N(aN[2]);}if(aN[5]){aN=aN[5][u](/\s*,\s*/);E=N(aN[0])*2.55;R=N(aN[1])*2.55;aP=N(aN[2])*2.55;}if(aN[6]){aN=aN[6][u](/\s*,\s*/);E=N(aN[0]);R=N(aN[1]);aP=N(aN[2]);return af.hsb2rgb(E,R,aP);}if(aN[7]){aN=aN[7][u](/\s*,\s*/);E=N(aN[0])*2.55;R=N(aN[1])*2.55;aP=N(aN[2])*2.55;return af.hsb2rgb(E,R,aP);}aN={r:E,g:R,b:aP};var i=(~~E)[ao](16),S=(~~R)[ao](16),aO=(~~aP)[ao](16);i=i[aC](aG,"0");S=S[aC](aG,"0");aO=aO[aC](aG,"0");aN.hex="#"+i+S+aO;return aN;}return{r:-1,g:-1,b:-1,hex:"none",error:1};},af);af.getColor=function(i){var E=this.getColor.start=this.getColor.start||{h:0,s:1,b:i||0.75},e=this.hsb2rgb(E.h,E.s,E.b);E.h+=0.075;if(E.h>1){E.h=0;E.s-=0.2;E.s<=0&&(this.getColor.start={h:0,s:1,b:E.b});}return e.hex;};af.getColor.reset=function(){delete this.start;};af.parsePathString=aa(function(e){if(!e){return null;}var E={a:7,c:6,h:1,l:2,m:2,q:4,s:4,t:2,v:1,z:0},i=[];if(af.is(e,"array")&&af.is(e[0],"array")){i=ak(e);}if(!i[l]){(e+ai)[aC](/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,function(S,R,aO){var aN=[],aM=aL.call(R);aO[aC](/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig,function(aQ,aP){aP&&aN[d](+aP);});while(aN[l]>=E[aM]){i[d]([R][aF](aN.splice(0,E[aM])));if(!E[aM]){break;}}});}i[ao]=af._path2string;return i;});var L=aa(function(aR){if(!aR){return{x:0,y:0,width:0,height:0};}aR=A(aR);var aO=0,aN=0,R=[],E=[];for(var S=0,aQ=aR[l];SaP){aQ=aQ-S*2;}if(!aM&&aP>aQ){aP=aP-S*2;}}else{aQ=aY[0];aP=aY[1];a0=aY[2];aZ=aY[3];}var aU=aP-aQ;if(Math.abs(aU)>a2){var a1=aP,a4=aV,aS=bp;aP=aQ+a2*(aM&&aP>aQ?1:-1);aV=a0+a5*Math.cos(aP);bp=aZ+a3*Math.sin(aP);a9=C(aV,bp,a5,a3,aX,0,aM,a4,aS,[aP,a1,a0,aZ]);}aU=aP-aQ;var aO=Math.cos(aQ),bo=Math.sin(aQ),aN=Math.cos(aP),bn=Math.sin(aP),bc=Math.tan(aU/4),bf=4/3*a5*bc,bd=4/3*a3*bc,bl=[aW,bq],bk=[aW+bf*bo,bq-bd*aO],bj=[aV+bf*bn,bp-bd*aN],bh=[aV,bp];bk[0]=2*bl[0]-bk[0];bk[1]=2*bl[1]-bk[1];if(aY){return[bk,bj,bh][aF](a9);}else{a9=[bk,bj,bh][aF](a9)[an](",")[u](",");var a7=[];for(var bi=0,a8=a9[l];bi0&&aN<1?aN:0),aM=F(i,e,R,E,aX,aW,aT,aQ,S>0&&S<1?S:0);aU=aU[aF](aO.x,aM.x);aR=aR[aF](aO.y,aM.y);aV=(aW-2*E+e)-(aQ-2*aW+E);aS=2*(E-e)-2*(aW-E);aP=e-E;aN=(-aS+Math.sqrt(aS*aS-4*aV*aP))/2/aV;S=(-aS-Math.sqrt(aS*aS-4*aV*aP))/2/aV;aO=F(i,e,R,E,aX,aW,aT,aQ,aN>0&&aN<1?aN:0);aM=F(i,e,R,E,aX,aW,aT,aQ,S>0&&S<1?S:0);aU=aU[aF](aO.x,aM.x);aR=aR[aF](aO.y,aM.y);return{min:{x:aw[aI](0,aU),y:aw[aI](0,aR)},max:{x:f[aI](0,aU),y:f[aI](0,aR)}};}),A=aa(function(aW,aR){var S=p(aW),aS=aR&&p(aR),aT={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},e={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},aN=function(aX,aY){var i,aZ;if(!aX){return["C",aY.x,aY.y,aY.x,aY.y,aY.x,aY.y];}!(aX[0] in {T:1,Q:1})&&(aY.qx=aY.qy=null);switch(aX[0]){case"M":aY.X=aX[1];aY.Y=aX[2];break;case"A":aX=["C"][aF](C[aI](0,[aY.x,aY.y][aF](aX.slice(1))));break;case"S":i=aY.x+(aY.x-(aY.bx||aY.x));aZ=aY.y+(aY.y-(aY.by||aY.y));aX=["C",i,aZ][aF](aX.slice(1));break;case"T":aY.qx=aY.x+(aY.x-(aY.qx||aY.x));aY.qy=aY.y+(aY.y-(aY.qy||aY.y));aX=["C"][aF](ay(aY.x,aY.y,aY.qx,aY.qy,aX[1],aX[2]));break;case"Q":aY.qx=aX[1];aY.qy=aX[2];aX=["C"][aF](ay(aY.x,aY.y,aX[1],aX[2],aX[3],aX[4]));break;case"L":aX=["C"][aF](aJ(aY.x,aY.y,aX[1],aX[2]));break;case"H":aX=["C"][aF](aJ(aY.x,aY.y,aX[1],aY.y));break;case"V":aX=["C"][aF](aJ(aY.x,aY.y,aY.x,aX[1]));break;case"Z":aX=["C"][aF](aJ(aY.x,aY.y,aY.X,aY.Y));break;}return aX;},E=function(aX,aY){if(aX[aY][l]>7){aX[aY].shift();var aZ=aX[aY];while(aZ[l]){aX.splice(aY++,0,["C"][aF](aZ.splice(0,6)));}aX.splice(aY,1);aU=f(S[l],aS&&aS[l]||0);}},R=function(a3,a0,aY,aX,aZ){if(a3&&a0&&a3[aZ][0]=="M"&&a0[aZ][0]!="M"){a0.splice(aZ,0,["M",aX.x,aX.y]);aY.bx=0;aY.by=0;aY.x=a3[aZ][1];aY.y=a3[aZ][2];aU=f(S[l],aS&&aS[l]||0);}};for(var aP=0,aU=f(S[l],aS&&aS[l]||0);aP3){return{container:1,x:arguments[0],y:arguments[1],width:arguments[2],height:arguments[3]};}}},au=function(e,E){var i=this;for(var R in E){if(E[J](R)&&!(R in e)){switch(typeof E[R]){case"function":(function(S){e[R]=e===i?S:function(){return S[aI](i,arguments);};})(E[R]);break;case"object":e[R]=e[R]||{};au.call(this,e[R],E[R]);break;default:e[R]=E[R];break;}}}},ac=function(e,i){e==i.top&&(i.top=e.prev);e==i.bottom&&(i.bottom=e.next);e.next&&(e.next.prev=e.prev);e.prev&&(e.prev.next=e.next);},P=function(e,i){if(i.top===e){return;}ac(e,i);e.next=null;e.prev=i.top;i.top.next=e;i.top=e;},j=function(e,i){if(i.bottom===e){return;}ac(e,i);e.next=i.bottom;e.prev=null;i.bottom.prev=e;i.bottom=e;},v=function(i,e,E){ac(i,E);e==E.top&&(E.top=i);e.next&&(e.next.prev=i);i.next=e.next;i.prev=e;e.next=i;},ah=function(i,e,E){ac(i,E);e==E.bottom&&(E.bottom=i);e.prev&&(e.prev.next=i);i.prev=e.prev;e.prev=i;i.next=e;};if(af.svg){aD.svgns="http://www.w3.org/2000/svg";aD.xlink="http://www.w3.org/1999/xlink";var H=function(e){return +e+(~~e===e)*0.5;},M=function(aM){for(var E=0,R=aM[l];E0.25){aM=Math.sqrt(0.25-aA(aO-0.5,2))+0.5;}}return ai;});aU=aU[u](/\s*\-\s*/);if(aR=="linear"){var aN=aU.shift();aN=-N(aN);if(isNaN(aN)){return null;}var S=[0,0,Math.cos(aN*Math.PI/180),Math.sin(aN*Math.PI/180)],aT=1/(f(Math.abs(S[2]),Math.abs(S[3]))||1);S[2]*=aT;S[3]*=aT;if(S[2]<0){S[0]=-S[2];S[2]=0;}if(S[3]<0){S[1]=-S[3];S[3]=0;}}var aQ=n(aU);if(!aQ){return null;}var E=ax(aR+"Gradient");E.id="r"+(af._id++)[ao](36);aR=="radial"?ax(E,{fx:aO,fy:aM}):ax(E,{x1:S[0],y1:S[1],x2:S[2],y2:S[3]});e.defs[az](E);for(var aP=0,aV=aQ[l];aPaO.height)&&(aO.height=aN.y+aN.height-aO.y);(aN.x+aN.width-aO.x>aO.width)&&(aO.width=aN.x+aN.width-aO.x);}}R&&this.hide();return aO;};am[aK].attr=function(){if(this.removed){return this;}if(arguments[l]==0){var S={};for(var R in this.attrs){if(this.attrs[J](R)){S[R]=this.attrs[R];}}return S;}if(arguments[l]==1&&af.is(arguments[0],"string")){if(arguments[0]=="translation"){return q.call(this);}if(arguments[0]=="rotation"){return this.rotate();}if(arguments[0]=="scale"){return this.scale();}return this.attrs[arguments[0]];}if(arguments[l]==1&&af.is(arguments[0],"array")){var e={};for(var E in arguments[0]){if(arguments[0][J](E)){e[arguments[0][E]]=this.attrs[arguments[0][E]];}}return e;}if(arguments[l]==2){var aM={};aM[arguments[0]]=arguments[1];T(this,aM);}else{if(arguments[l]==1&&af.is(arguments[0],"object")){T(this,arguments[0]);}}return this;};am[aK].toFront=function(){if(this.removed){return this;}this.node.parentNode[az](this.node);var e=this.paper;e.top!=this&&P(this,e);return this;};am[aK].toBack=function(){if(this.removed){return this;}if(this.node.parentNode.firstChild!=this.node){this.node.parentNode.insertBefore(this.node,this.node.parentNode.firstChild);j(this,this.paper);var e=this.paper;}return this;};am[aK].insertAfter=function(i){if(this.removed){return this;}var e=this.paper,E=i.node;if(E.nextSibling){E.parentNode.insertBefore(this.node,E.nextSibling);}else{E.parentNode[az](this.node);}v(this,i,this.paper);return this;};am[aK].insertBefore=function(e){if(this.removed){return this;}var i=e.node;i.parentNode.insertBefore(this.node,i);ah(this,e,this.paper);return this;};var I=function(i,e,aM,S){e=H(e);aM=H(aM);var R=ax("circle");i.canvas&&i.canvas[az](R);var E=new am(R,i);E.attrs={cx:e,cy:aM,r:S,fill:"none",stroke:"#000"};E.type="circle";ax(R,E.attrs);return E;};var at=function(E,e,aO,i,aM,aN){e=H(e);aO=H(aO);var S=ax("rect");E.canvas&&E.canvas[az](S);var R=new am(S,E);R.attrs={x:e,y:aO,width:i,height:aM,r:aN||0,rx:aN||0,ry:aN||0,fill:"none",stroke:"#000"};R.type="rect";ax(S,R.attrs);return R;};var Z=function(i,e,aN,aM,S){e=H(e);aN=H(aN);var R=ax("ellipse");i.canvas&&i.canvas[az](R);var E=new am(R,i);E.attrs={cx:e,cy:aN,rx:aM,ry:S,fill:"none",stroke:"#000"};E.type="ellipse";ax(R,E.attrs);return E;};var m=function(E,aN,e,aO,i,aM){var S=ax("image");ax(S,{x:e,y:aO,width:i,height:aM,preserveAspectRatio:"none"});S.setAttributeNS(E.xlink,"href",aN);E.canvas&&E.canvas[az](S);var R=new am(S,E);R.attrs={x:e,y:aO,width:i,height:aM,src:aN};R.type="image";return R;};var O=function(i,e,aM,S){var R=ax("text");ax(R,{x:e,y:aM,"text-anchor":"middle"});i.canvas&&i.canvas[az](R);var E=new am(R,i);E.attrs={x:e,y:aM,"text-anchor":"middle",text:S,font:h.font,stroke:"none",fill:"#000"};E.type="text";T(E,E.attrs);return E;};var aH=function(i,e){this.width=i||this.width;this.height=e||this.height;this.canvas[r]("width",this.width);this.canvas[r]("height",this.height);return this;};var s=function(){var R=ag[aI](null,arguments),E=R&&R.container,i=R.x,aO=R.y,S=R.width,e=R.height;if(!E){throw new Error("SVG container not found.");}aD.canvas=ax("svg");var aN=aD.canvas;aD.width=S||512;aD.height=e||342;aN[r]("width",aD.width);aN[r]("height",aD.height);if(E==1){aN.style.cssText="position:absolute;left:"+i+"px;top:"+aO+"px";D.body[az](aN);}else{if(E.firstChild){E.insertBefore(aN,E.firstChild);}else{E[az](aN);}}E={canvas:aN};for(var aM in aD){if(aD[J](aM)){E[aM]=aD[aM];}}E.bottom=E.top=null;au.call(E,E,af.fn);E.clear();E.raphael=af;return E;};aD.clear=function(){var e=this.canvas;while(e.firstChild){e.removeChild(e.firstChild);}this.bottom=this.top=null;(this.desc=ax("desc"))[az](D.createTextNode("Created with Rapha\xebl"));e[az](this.desc);e[az](this.defs=ax("defs"));};aD.remove=function(){this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas);for(var e in this){delete this[e];}};}if(af.vml){var av=function(aV){var aS=/[ahqtv]/ig,aN=p;(aV+ai).match(aS)&&(aN=A);aS=/[clmz]/g;if(aN==p&&!(aV+ai).match(aS)){var E={M:"m",L:"l",C:"c",Z:"x",m:"t",l:"r",c:"v",z:"x"},S=/([clmz]),?([^clmz]*)/gi,aM=/-?[^,\s-]+/g;var aR=(aV+ai)[aC](S,function(aW,aY,i){var aX=[];i[aC](aM,function(aZ){aX[d](H(aZ));});return E[aY]+aX;});return aR;}var aT=aN(aV),R,aR=[],e;for(var aP=0,aU=aT[l];aP1&&(i=1);aU.opacity=i;}aV.fill&&(aU.on=true);if(aU.on==null||aV.fill=="none"){aU.on=false;}if(aU.on&&aV.fill){var E=aV.fill.match(c);if(E){aU.src=E[1];aU.type="tile";}else{aU.color=af.getRGB(aV.fill).hex;aU.src=ai;aU.type="solid";if(af.getRGB(aV.fill).error&&(a0.type in {circle:1,ellipse:1}||(aV.fill+ai).charAt()!="r")&&b(a0,aV.fill)){aW.fill="none";aW.gradient=aV.fill;}}}aX&&aT[az](aU);var S=(aT.getElementsByTagName("stroke")&&aT.getElementsByTagName("stroke")[0]),aY=false;!S&&(aY=S=Y("stroke"));if((aV.stroke&&aV.stroke!="none")||aV["stroke-width"]||aV["stroke-opacity"]!=null||aV["stroke-dasharray"]||aV["stroke-miterlimit"]||aV["stroke-linejoin"]||aV["stroke-linecap"]){S.on=true;}(aV.stroke=="none"||S.on==null||aV.stroke==0||aV["stroke-width"]==0)&&(S.on=false);S.on&&aV.stroke&&(S.color=af.getRGB(aV.stroke).hex);var i=((+aW["stroke-opacity"]+1||2)-1)*((+aW.opacity+1||2)-1),aR=(N(aV["stroke-width"])||1)*0.75;i<0&&(i=0);i>1&&(i=1);aV["stroke-width"]==null&&(aR=aW["stroke-width"]);aV["stroke-width"]&&(S.weight=aR);aR&&aR<1&&(i*=aR)&&(S.weight=1);S.opacity=i;aV["stroke-linejoin"]&&(S.joinstyle=aV["stroke-linejoin"]||"miter");S.miterlimit=aV["stroke-miterlimit"]||8;aV["stroke-linecap"]&&(S.endcap=aV["stroke-linecap"]=="butt"?"flat":aV["stroke-linecap"]=="square"?"square":"round");if(aV["stroke-dasharray"]){var aS={"-":"shortdash",".":"shortdot","-.":"shortdashdot","-..":"shortdashdotdot",". ":"dot","- ":"dash","--":"longdash","- .":"dashdot","--.":"longdashdot","--..":"longdashdotdot"};S.dashstyle=aS[J](aV["stroke-dasharray"])?aS[aV["stroke-dasharray"]]:ai;}aY&&aT[az](S);}if(a0.type=="text"){var aN=a0.paper.span.style;aW.font&&(aN.font=aW.font);aW["font-family"]&&(aN.fontFamily=aW["font-family"]);aW["font-size"]&&(aN.fontSize=aW["font-size"]);aW["font-weight"]&&(aN.fontWeight=aW["font-weight"]);aW["font-style"]&&(aN.fontStyle=aW["font-style"]);a0.node.string&&(a0.paper.span.innerHTML=(a0.node.string+ai)[aC](/"));a0.W=aW.w=a0.paper.span.offsetWidth;a0.H=aW.h=a0.paper.span.offsetHeight;a0.X=aW.x;a0.Y=aW.y+H(a0.H/2);switch(aW["text-anchor"]){case"start":a0.node.style["v-text-align"]="left";a0.bbx=H(a0.W/2);break;case"end":a0.node.style["v-text-align"]="right";a0.bbx=-H(a0.W/2);break;default:a0.node.style["v-text-align"]="center";break;}}};var b=function(e,aO){e.attrs=e.attrs||{};var aP=e.attrs,aR=e.node.getElementsByTagName("fill"),aM="linear",aN=".5 .5";e.attrs.gradient=aO;aO=(aO+ai)[aC](/^r(?:$([^,]+?)\s*,\s*([^$]+?)\))?/,function(aT,aU,i){aM="radial";if(aU&&i){aU=N(aU);i=N(i);if(aA(aU-0.5,2)+aA(i-0.5,2)>0.25){i=Math.sqrt(0.25-aA(aU-0.5,2))+0.5;}aN=aU+ae+i;}return ai;});aO=aO[u](/\s*\-\s*/);if(aM=="linear"){var E=aO.shift();E=-N(E);if(isNaN(E)){return null;}}var S=n(aO);if(!S){return null;}e=e.shape||e.node;aR=aR[0]||Y("fill");if(S[l]){aR.on=true;aR.method="none";aR.type=(aM=="radial")?"gradientradial":"gradient";aR.color=S[0].color;aR.color2=S[S[l]-1].color;var aS=[];for(var R=0,aQ=S[l];R');};}catch(X){var Y=function(e){return D.createElement("<"+e+' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');};}var s=function(){var R=ag[aI](null,arguments),i=R.container,aQ=R.height,aR,E=R.width,aP=R.x,aO=R.y;if(!i){throw new Error("VML container not found.");}var aM={},aN=aM.canvas=D.createElement("div"),S=aN.style;E=E||512;aQ=aQ||342;E==+E&&(E+="px");aQ==+aQ&&(aQ+="px");aM.width=1000;aM.height=1000;aM.coordsize="1000 1000";aM.coordorigin="0 0";aM.span=D.createElement("span");aM.span.style.cssText="position:absolute;left:-9999px;top:-9999px;padding:0;margin:0;line-height:1;display:inline;";aN[az](aM.span);S.cssText=af.format("width:{0};height:{1};position:absolute;clip:rect(0 {0} {1} 0);overflow:hidden",E,aQ);if(i==1){D.body[az](aN);S.left=aP+"px";S.top=aO+"px";i={style:{width:E,height:aQ}};}else{i.style.width=E;i.style.height=aQ;if(i.firstChild){i.insertBefore(aN,i.firstChild);}else{i[az](aN);}}for(var e in aD){if(aD[J](e)){aM[e]=aD[e];}}au.call(aM,aM,af.fn);aM.top=aM.bottom=null;aM.raphael=af;return aM;};aD.clear=function(){this.canvas.innerHTML=ai;this.bottom=this.top=null;};aD.remove=function(){this.canvas.parentNode.removeChild(this.canvas);for(var e in this){delete this[e];}};}if({"Apple Computer, Inc.":1,"Google Inc.":1}[navigator.vendor]&&!(navigator.userAgent.indexOf("Version/4.0")+1)){aD.safari=function(){var e=this.rect(-99,-99,this.width+99,this.height+99);setTimeout(function(){e.remove();});};}else{aD.safari=function(){};}var W=(function(){if(D.addEventListener){return function(S,E,i,e){var R=function(aM){return i.call(e,aM);};S.addEventListener(E,R,false);return function(){S.removeEventListener(E,R,false);return true;};};}else{if(D.attachEvent){return function(aM,R,E,i){var S=function(aN){return E.call(i,aN||aj.event);};aM.attachEvent("on"+R,S);var e=function(){aM.detachEvent("on"+R,S);return true;};if(R=="mouseover"){aM.attachEvent("onmouseenter",S);return function(){aM.detachEvent("onmouseenter",S);return e();};}else{if(R=="mouseout"){aM.attachEvent("onmouseleave",S);return function(){aM.detachEvent("onmouseleave",S);return e();};}}return e;};}}})();for(var U=y[l];U--;){(function(e){am[aK][e]=function(i){if(af.is(i,"function")){this.events=this.events||{};this.events[e]=this.events[e]||{};this.events[e][i]=this.events[e][i]||[];this.events[e][i][d](W(this.shape||this.node,e,i,this));}return this;};am[aK]["un"+e]=function(i){var E=this.events;E&&E[e]&&E[e][i]&&E[e][i][l]&&E[e][i].shift()()&&!E[e][i][l]&&delete E[e][i];return this;};})(y[U]);}am[aK].hover=function(i,e){return this.mouseover(i).mouseout(e);};aD.circle=function(e,E,i){return I(this,e||0,E||0,i||0);};aD.rect=function(e,S,i,E,R){return at(this,e||0,S||0,i||0,E||0,R||0);};aD.ellipse=function(e,R,E,i){return Z(this,e||0,R||0,E||0,i||0);};aD.path=function(e){e&&!af.is(e,"string")&&!af.is(e[0],"array")&&(e+=ai);return o(af.format[aI](af,arguments),this);};aD.image=function(R,e,S,i,E){return m(this,R||"about:blank",e||0,S||0,i||0,E||0);};aD.text=function(e,E,i){return O(this,e||0,E||0,i||ai);};aD.set=function(e){arguments[l]>1&&(e=Array[aK].splice.call(arguments,0,arguments[l]));return new K(e);};aD.setSize=aH;am[aK].scale=function(aW,aV,R,E){if(aW==null&&aV==null){return{x:this._.sx,y:this._.sy,toString:function(){return this.x+ae+this.y;}};}aV=aV||aW;!+aV&&(aV=aW);var a0,aY,aZ,aX,bc=this.attrs;if(aW!=0){var aT=this.getBBox(),aQ=aT.x+aT.width/2,aM=aT.y+aT.height/2,ba=aW/this._.sx,a9=aV/this._.sy;R=(+R||R==0)?R:aQ;E=(+E||E==0)?E:aM;var aS=~~(aW/Math.abs(aW)),aP=~~(aV/Math.abs(aV)),a3=this.node.style,be=R+(aQ-R)*ba,bd=E+(aM-E)*a9;switch(this.type){case"rect":case"image":var aR=bc.width*aS*ba,a2=bc.height*aP*a9,aU=bc.r*aw(ba,a9),aO=be-aR/2,S=bd-a2/2;this.attr({width:aR,height:a2,x:aO,y:S,r:aU});break;case"circle":case"ellipse":this.attr({rx:bc.rx*aS*ba,ry:bc.ry*aP*a9,r:bc.r*aw(aS*ba,aP*a9),cx:be,cy:bd});break;case"path":var a5=V(bc.path),a6=true;for(var a8=0,a1=a5[l];a8":function(e){return aA(e-1,3)+1;},"<>":function(e){e=e*2;if(e<1){return aA(e,3)/2;}e-=2;return(aA(e,3)+2)/2;},backIn:function(i){var e=1.70158;return i*i*((e+1)*i-e);},backOut:function(i){i=i-1;var e=1.70158;return i*i*((e+1)*i+e)+1;},elastic:function(E){if(E==0||E==1){return E;}var i=0.3,e=i/4;return aA(2,-10*E)*Math.sin((E-e)*(2*Math.PI)/i)+1;},bounce:function(R){var i=7.5625,E=2.75,e;if(R<(1/E)){e=i*R*R;}else{if(R<(2/E)){R-=(1.5/E);e=i*R*R+0.75;}else{if(R<(2.5/E)){R-=(2.25/E);e=i*R*R+0.9375;}else{R-=(2.625/E);e=i*R*R+0.984375;}}}return e;}};var B={length:0},aE=function(){var aP=+new Date;for(var a0 in B){if(a0!="length"&&B[J](a0)){var a5=B[a0];if(a5.stop){delete B[a0];B[l]--;continue;}var aN=aP-a5.start,aY=a5.ms,aX=a5.easing,a1=a5.from,aU=a5.diff,R=a5.to,aT=a5.t,aW=a5.prev||0,aO=a5.el,S=a5.callback,aV={},E;if(aN255?255:(e<0?0:e);},q=function(e,E){if(e==null){return{x:this._.tx,y:this._.ty};}this._.tx+=+e;this._.ty+=+E;switch(this.type){case"circle":case"ellipse":this.attr({cx:+e+this.attrs.cx,cy:+E+this.attrs.cy});break;case"rect":case"image":case"text":this.attr({x:+e+this.attrs.x,y:+E+this.attrs.y});break;case"path":var i=V(this.attrs.path);i[0][1]+=+e;i[0][2]+=+E;this.attr({path:i});break;}return this;};am[aK].animateWith=function(i,E,e,S,R){B[i.id]&&(E.start=B[i.id].start);return this.animate(E,e,S,R);};am[aK].onAnimation=function(e){this._run=e||null;return this;};am[aK].animate=function(R,e,aR,aX){if(af.is(aR,"function")||!aR){aX=aR||null;}var aS={},aT={},aU={};for(var aQ in R){if(R[J](aQ)){if(Q[J](aQ)){aS[aQ]=this.attr(aQ);(aS[aQ]==null)&&(aS[aQ]=h[aQ]);aT[aQ]=R[aQ];switch(Q[aQ]){case"number":aU[aQ]=(aT[aQ]-aS[aQ])/e;break;case"colour":aS[aQ]=af.getRGB(aS[aQ]);var aO=af.getRGB(aT[aQ]);aU[aQ]={r:(aO.r-aS[aQ].r)/e,g:(aO.g-aS[aQ].g)/e,b:(aO.b-aS[aQ].b)/e};break;case"path":var E=A(aS[aQ],aT[aQ]);aS[aQ]=E[0];aT[aQ]=E[1];aU[aQ]=[];for(var aN=0,aW=aS[aQ][l];aN");i.close();aO=i.body;}catch(aQ){aO=createPopup().document.body;}var S=aO.createTextRange();try{aO.style.color=aN;var aP=S.queryCommandValue("ForeColor");aP=((aP&255)<<16)|(aP&65280)|((aP&16711680)>>>16);return"#"+("000000"+aP[ao](16)).slice(-6);}catch(aQ){return"none";}});}else{var R=D.createElement("i");R.className="Rapha\xebl Colour Picker";R.style.cssText="display:none";D.body[aA](R);ar=aa(function(i){R.style.color=i;return D.defaultView.getComputedStyle(R,ai).getPropertyValue("color");});}return ar(E);};af.hsb2rgb=aa(function(aR,aP,aV){if(af.is(aR,"object")&&"h" in aR&&"s" in aR&&"b" in aR){aV=aR.b;aP=aR.s;aR=aR.h;}var S,aN,aW;if(aV==0){return{r:0,g:0,b:0,hex:"#000"};}if(aR>1||aP>1||aV>1){aR/=255;aP/=255;aV/=255;}var aO=~~(aR*6),aS=(aR*6)-aO,R=aV*(1-aP),E=aV*(1-(aP*aS)),aX=aV*(1-(aP*(1-aS)));S=[aV,E,R,R,aX,aV,aV][aO];aN=[aX,aV,aV,E,R,R,aX][aO];aW=[R,R,aX,aV,aV,E,R][aO];S*=255;aN*=255;aW*=255;var aT={r:S,g:aN,b:aW},e=(~~S)[ao](16),aQ=(~~aN)[ao](16),aU=(~~aW)[ao](16);e=e[aD](aH,"0");aQ=aQ[aD](aH,"0");aU=aU[aD](aH,"0");aT.hex="#"+e+aQ+aU;return aT;},af);af.rgb2hsb=aa(function(e,i,aP){if(af.is(e,"object")&&"r" in e&&"g" in e&&"b" in e){aP=e.b;i=e.g;e=e.r;}if(af.is(e,"string")){var aR=af.getRGB(e);e=aR.r;i=aR.g;aP=aR.b;}if(e>1||i>1||aP>1){e/=255;i/=255;aP/=255;}var aO=f(e,i,aP),E=ax(e,i,aP),S,R,aN=aO;if(E==aO){return{h:0,s:0,b:aO};}else{var aQ=(aO-E);R=aQ/aO;if(e==aO){S=(i-aP)/aQ;}else{if(i==aO){S=2+((aP-e)/aQ);}else{S=4+((e-i)/aQ);}}S/=6;S<0&&S++;S>1&&S--;}return{h:S,s:R,b:aN};},af);var at=/,?([achlmqrstvxz]),?/gi;af._path2string=function(){return this.join(",")[aD](at,"$1");};function aa(R,i,e){function E(){var S=Array[aL].slice.call(arguments,0),aO=S[an]("\u25ba"),aN=E.cache=E.cache||{},aP=E.count=E.count||[];if(aN[J](aO)){return e?e(aN[aO]):aN[aO];}aP[l]>=1000&&delete aN[aP.shift()];aP[d](aO);aN[aO]=R[aJ](i,S);return e?e(aN[aO]):aN[aO];}return E;}af.getRGB=aa(function(e){if(!e||!!((e+ai).indexOf("-")+1)){return{r:-1,g:-1,b:-1,hex:"none",error:1};}e=e+ai;if(e=="none"){return{r:-1,g:-1,b:-1,hex:"none"};}!({hs:1,rg:1})[J](e.substring(0,2))&&(e=ar(e));var aN,E,R,aQ,aO=e.match(/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb$\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*$|rgb$\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*$|hs[bl]$\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*$|hs[bl]$\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*$)\s*$/i);if(aO){if(aO[2]){aQ=z(aO[2].substring(5),16);R=z(aO[2].substring(3,5),16);E=z(aO[2].substring(1,3),16);}if(aO[3]){aQ=z(aO[3].substring(3)+aO[3].substring(3),16);R=z(aO[3].substring(2,3)+aO[3].substring(2,3),16);E=z(aO[3].substring(1,2)+aO[3].substring(1,2),16);}if(aO[4]){aO=aO[4][u](/\s*,\s*/);E=N(aO[0]);R=N(aO[1]);aQ=N(aO[2]);}if(aO[5]){aO=aO[5][u](/\s*,\s*/);E=N(aO[0])*2.55;R=N(aO[1])*2.55;aQ=N(aO[2])*2.55;}if(aO[6]){aO=aO[6][u](/\s*,\s*/);E=N(aO[0]);R=N(aO[1]);aQ=N(aO[2]);return af.hsb2rgb(E,R,aQ);}if(aO[7]){aO=aO[7][u](/\s*,\s*/);E=N(aO[0])*2.55;R=N(aO[1])*2.55;aQ=N(aO[2])*2.55;return af.hsb2rgb(E,R,aQ);}aO={r:E,g:R,b:aQ};var i=(~~E)[ao](16),S=(~~R)[ao](16),aP=(~~aQ)[ao](16);i=i[aD](aH,"0");S=S[aD](aH,"0");aP=aP[aD](aH,"0");aO.hex="#"+i+S+aP;return aO;}return{r:-1,g:-1,b:-1,hex:"none",error:1};},af);af.getColor=function(i){var E=this.getColor.start=this.getColor.start||{h:0,s:1,b:i||0.75},e=this.hsb2rgb(E.h,E.s,E.b);E.h+=0.075;if(E.h>1){E.h=0;E.s-=0.2;E.s<=0&&(this.getColor.start={h:0,s:1,b:E.b});}return e.hex;};af.getColor.reset=function(){delete this.start;};af.parsePathString=aa(function(e){if(!e){return null;}var E={a:7,c:6,h:1,l:2,m:2,q:4,s:4,t:2,v:1,z:0},i=[];if(af.is(e,"array")&&af.is(e[0],"array")){i=ak(e);}if(!i[l]){(e+ai)[aD](/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,function(S,R,aP){var aO=[],aN=aM.call(R);aP[aD](/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig,function(aR,aQ){aQ&&aO[d](+aQ);});while(aO[l]>=E[aN]){i[d]([R][aG](aO.splice(0,E[aN])));if(!E[aN]){break;}}});}i[ao]=af._path2string;return i;});var L=aa(function(aT){if(!aT){return{x:0,y:0,width:0,height:0};}aT=A(aT);var aQ=0,aP=0,S=[],E=[],R;for(var aN=0,aS=aT[l];aNaQ){aR=aR-S*2;}if(!aN&&aQ>aR){aQ=aQ-S*2;}}else{aR=aZ[0];aQ=aZ[1];a1=aZ[2];a0=aZ[3];}var aV=aQ-aR;if(Math.abs(aV)>a3){var a2=aQ,a5=aW,aT=bq;aQ=aR+a3*(aN&&aQ>aR?1:-1);aW=a1+a6*Math.cos(aQ);bq=a0+a4*Math.sin(aQ);ba=C(aW,bq,a6,a4,aY,0,aN,a5,aT,[aQ,a2,a1,a0]);}aV=aQ-aR;var aP=Math.cos(aR),bp=Math.sin(aR),aO=Math.cos(aQ),bo=Math.sin(aQ),bd=Math.tan(aV/4),bg=4/3*a6*bd,be=4/3*a4*bd,bm=[aX,br],bl=[aX+bg*bp,br-be*aP],bk=[aW+bg*bo,bq-be*aO],bi=[aW,bq];bl[0]=2*bm[0]-bl[0];bl[1]=2*bm[1]-bl[1];if(aZ){return[bl,bk,bi][aG](ba);}else{ba=[bl,bk,bi][aG](ba)[an](",")[u](",");var a8=[];for(var bj=0,a9=ba[l];bj0&&aO<1){i=F(E,e,S,R,aX,aW,aT,aQ,aO);aU[d](i.x);aR[d](i.y);}if(aN>0&&aN<1){i=F(E,e,S,R,aX,aW,aT,aQ,aN);aU[d](i.x);aR[d](i.y);}aV=(aW-2*R+e)-(aQ-2*aW+R);aS=2*(R-e)-2*(aW-R);aP=e-R;aO=(-aS+Math.sqrt(aS*aS-4*aV*aP))/2/aV;aN=(-aS-Math.sqrt(aS*aS-4*aV*aP))/2/aV;!isFinite(aO)&&(aO=0.5);!isFinite(aN)&&(aN=0.5);if(aO>0&&aO<1){i=F(E,e,S,R,aX,aW,aT,aQ,aO);aU[d](i.x);aR[d](i.y);}if(aN>0&&aN<1){i=F(E,e,S,R,aX,aW,aT,aQ,aN);aU[d](i.x);aR[d](i.y);}return{min:{x:ax[aJ](0,aU),y:ax[aJ](0,aR)},max:{x:f[aJ](0,aU),y:f[aJ](0,aR)}};}),A=aa(function(aX,aS){var S=p(aX),aT=aS&&p(aS),aU={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},e={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},aO=function(aY,aZ){var i,a0;if(!aY){return["C",aZ.x,aZ.y,aZ.x,aZ.y,aZ.x,aZ.y];}!(aY[0] in {T:1,Q:1})&&(aZ.qx=aZ.qy=null);switch(aY[0]){case"M":aZ.X=aY[1];aZ.Y=aY[2];break;case"A":aY=["C"][aG](C[aJ](0,[aZ.x,aZ.y][aG](aY.slice(1))));break;case"S":i=aZ.x+(aZ.x-(aZ.bx||aZ.x));a0=aZ.y+(aZ.y-(aZ.by||aZ.y));aY=["C",i,a0][aG](aY.slice(1));break;case"T":aZ.qx=aZ.x+(aZ.x-(aZ.qx||aZ.x));aZ.qy=aZ.y+(aZ.y-(aZ.qy||aZ.y));aY=["C"][aG](az(aZ.x,aZ.y,aZ.qx,aZ.qy,aY[1],aY[2]));break;case"Q":aZ.qx=aY[1];aZ.qy=aY[2];aY=["C"][aG](az(aZ.x,aZ.y,aY[1],aY[2],aY[3],aY[4]));break;case"L":aY=["C"][aG](aK(aZ.x,aZ.y,aY[1],aY[2]));break;case"H":aY=["C"][aG](aK(aZ.x,aZ.y,aY[1],aZ.y));break;case"V":aY=["C"][aG](aK(aZ.x,aZ.y,aZ.x,aY[1]));break;case"Z":aY=["C"][aG](aK(aZ.x,aZ.y,aZ.X,aZ.Y));break;}return aY;},E=function(aY,aZ){if(aY[aZ][l]>7){aY[aZ].shift();var a0=aY[aZ];while(a0[l]){aY.splice(aZ++,0,["C"][aG](a0.splice(0,6)));}aY.splice(aZ,1);aV=f(S[l],aT&&aT[l]||0);}},R=function(a4,a3,aZ,aY,a0){if(a4&&a3&&a4[a0][0]=="M"&&a3[a0][0]!="M"){a3.splice(a0,0,["M",aY.x,aY.y]);aZ.bx=0;aZ.by=0;aZ.x=a4[a0][1];aZ.y=a4[a0][2];aV=f(S[l],aT&&aT[l]||0);}};for(var aQ=0,aV=f(S[l],aT&&aT[l]||0);aQ3){return{container:1,x:arguments[0],y:arguments[1],width:arguments[2],height:arguments[3]};}}},av=function(e,E){var i=this;for(var R in E){if(E[J](R)&&!(R in e)){switch(typeof E[R]){case"function":(function(S){e[R]=e===i?S:function(){return S[aJ](i,arguments);};})(E[R]);break;case"object":e[R]=e[R]||{};av.call(this,e[R],E[R]);break;default:e[R]=E[R];break;}}}},ac=function(e,i){e==i.top&&(i.top=e.prev);e==i.bottom&&(i.bottom=e.next);e.next&&(e.next.prev=e.prev);e.prev&&(e.prev.next=e.next);},P=function(e,i){if(i.top===e){return;}ac(e,i);e.next=null;e.prev=i.top;i.top.next=e;i.top=e;},j=function(e,i){if(i.bottom===e){return;}ac(e,i);e.next=i.bottom;e.prev=null;i.bottom.prev=e;i.bottom=e;},v=function(i,e,E){ac(i,E);e==E.top&&(E.top=i);e.next&&(e.next.prev=i);i.next=e.next;i.prev=e;e.next=i;},ah=function(i,e,E){ac(i,E);e==E.bottom&&(E.bottom=i);e.prev&&(e.prev.next=i);i.prev=e.prev;e.prev=i;i.next=e;};if(af.svg){aE.svgns="http://www.w3.org/2000/svg";aE.xlink="http://www.w3.org/1999/xlink";var H=function(e){return +e+(~~e===e)*0.5;},M=function(aN){for(var E=0,R=aN[l];E0.25){aN=Math.sqrt(0.25-aB(aP-0.5,2))+0.5;}}return ai;});aV=aV[u](/\s*\-\s*/);if(aS=="linear"){var aO=aV.shift();aO=-N(aO);if(isNaN(aO)){return null;}var S=[0,0,Math.cos(aO*Math.PI/180),Math.sin(aO*Math.PI/180)],aU=1/(f(Math.abs(S[2]),Math.abs(S[3]))||1);S[2]*=aU;S[3]*=aU;if(S[2]<0){S[0]=-S[2];S[2]=0;}if(S[3]<0){S[1]=-S[3];S[3]=0;}}var aR=n(aV);if(!aR){return null;}var E=ay(aS+"Gradient");E.id="r"+(af._id++)[ao](36);aS=="radial"?ay(E,{fx:aP,fy:aN}):ay(E,{x1:S[0],y1:S[1],x2:S[2],y2:S[3]});e.defs[aA](E);for(var aQ=0,aW=aR[l];aQaP.height)&&(aP.height=aO.y+aO.height-aP.y);(aO.x+aO.width-aP.x>aP.width)&&(aP.width=aO.x+aO.width-aP.x);}}R&&this.hide();return aP;};am[aL].attr=function(){if(this.removed){return this;}if(arguments[l]==0){var S={};for(var R in this.attrs){if(this.attrs[J](R)){S[R]=this.attrs[R];}}return S;}if(arguments[l]==1&&af.is(arguments[0],"string")){if(arguments[0]=="translation"){return q.call(this);}if(arguments[0]=="rotation"){return this.rotate();}if(arguments[0]=="scale"){return this.scale();}if(arguments[0]=="fill"&&this.attrs.fill=="none"&&this.attrs.gradient){return this.attrs.gradient;}return this.attrs[arguments[0]];}if(arguments[l]==1&&af.is(arguments[0],"array")){var e={};for(var E in arguments[0]){if(arguments[0][J](E)){e[arguments[0][E]]=this.attrs[arguments[0][E]];}}return e;}if(arguments[l]==2){var aN={};aN[arguments[0]]=arguments[1];T(this,aN);}else{if(arguments[l]==1&&af.is(arguments[0],"object")){T(this,arguments[0]);}}return this;};am[aL].toFront=function(){if(this.removed){return this;}this.node.parentNode[aA](this.node);var e=this.paper;e.top!=this&&P(this,e);return this;};am[aL].toBack=function(){if(this.removed){return this;}if(this.node.parentNode.firstChild!=this.node){this.node.parentNode.insertBefore(this.node,this.node.parentNode.firstChild);j(this,this.paper);var e=this.paper;}return this;};am[aL].insertAfter=function(i){if(this.removed){return this;}var e=this.paper,E=i.node;if(E.nextSibling){E.parentNode.insertBefore(this.node,E.nextSibling);}else{E.parentNode[aA](this.node);}v(this,i,this.paper);return this;};am[aL].insertBefore=function(e){if(this.removed){return this;}var i=e.node;i.parentNode.insertBefore(this.node,i);ah(this,e,this.paper);return this;};var I=function(i,e,aN,S){e=H(e);aN=H(aN);var R=ay("circle");i.canvas&&i.canvas[aA](R);var E=new am(R,i);E.attrs={cx:e,cy:aN,r:S,fill:"none",stroke:"#000"};E.type="circle";ay(R,E.attrs);return E;};var au=function(E,e,aP,i,aN,aO){e=H(e);aP=H(aP);var S=ay("rect");E.canvas&&E.canvas[aA](S);var R=new am(S,E);R.attrs={x:e,y:aP,width:i,height:aN,r:aO||0,rx:aO||0,ry:aO||0,fill:"none",stroke:"#000"};R.type="rect";ay(S,R.attrs);return R;};var Z=function(i,e,aO,aN,S){e=H(e);aO=H(aO);var R=ay("ellipse");i.canvas&&i.canvas[aA](R);var E=new am(R,i);E.attrs={cx:e,cy:aO,rx:aN,ry:S,fill:"none",stroke:"#000"};E.type="ellipse";ay(R,E.attrs);return E;};var m=function(E,aO,e,aP,i,aN){var S=ay("image");ay(S,{x:e,y:aP,width:i,height:aN,preserveAspectRatio:"none"});S.setAttributeNS(E.xlink,"href",aO);E.canvas&&E.canvas[aA](S);var R=new am(S,E);R.attrs={x:e,y:aP,width:i,height:aN,src:aO};R.type="image";return R;};var O=function(i,e,aN,S){var R=ay("text");ay(R,{x:e,y:aN,"text-anchor":"middle"});i.canvas&&i.canvas[aA](R);var E=new am(R,i);E.attrs={x:e,y:aN,"text-anchor":"middle",text:S,font:h.font,stroke:"none",fill:"#000"};E.type="text";T(E,E.attrs);return E;};var aI=function(i,e){this.width=i||this.width;this.height=e||this.height;this.canvas[r]("width",this.width);this.canvas[r]("height",this.height);return this;};var s=function(){var R=ag[aJ](null,arguments),E=R&&R.container,i=R.x,aP=R.y,S=R.width,e=R.height;if(!E){throw new Error("SVG container not found.");}aE.canvas=ay("svg");var aO=aE.canvas;aE.width=S||512;aE.height=e||342;aO[r]("width",aE.width);aO[r]("height",aE.height);if(E==1){aO.style.cssText="position:absolute;left:"+i+"px;top:"+aP+"px";D.body[aA](aO);}else{if(E.firstChild){E.insertBefore(aO,E.firstChild);}else{E[aA](aO);}}E={canvas:aO};for(var aN in aE){if(aE[J](aN)){E[aN]=aE[aN];}}E.bottom=E.top=null;av.call(E,E,af.fn);E.clear();E.raphael=af;return E;};aE.clear=function(){var e=this.canvas;while(e.firstChild){e.removeChild(e.firstChild);}this.bottom=this.top=null;(this.desc=ay("desc"))[aA](D.createTextNode("Created with Rapha\xebl"));e[aA](this.desc);e[aA](this.defs=ay("defs"));};aE.remove=function(){this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas);for(var e in this){delete this[e];}};}if(af.vml){var aw=function(aW){var aT=/[ahqtv]/ig,aO=p;(aW+ai).match(aT)&&(aO=A);aT=/[clmz]/g;if(aO==p&&!(aW+ai).match(aT)){var E={M:"m",L:"l",C:"c",Z:"x",m:"t",l:"r",c:"v",z:"x"},S=/([clmz]),?([^clmz]*)/gi,aN=/-?[^,\s-]+/g;var aS=(aW+ai)[aD](S,function(aX,aZ,i){var aY=[];i[aD](aN,function(a0){aY[d](H(a0));});return E[aZ]+aY;});return aS;}var aU=aO(aW),R,aS=[],e;for(var aQ=0,aV=aU[l];aQ1&&(i=1);aV.opacity=i;}aW.fill&&(aV.on=true);if(aV.on==null||aW.fill=="none"){aV.on=false;}if(aV.on&&aW.fill){var E=aW.fill.match(c);if(E){aV.src=E[1];aV.type="tile";}else{aV.color=af.getRGB(aW.fill).hex;aV.src=ai;aV.type="solid";if(af.getRGB(aW.fill).error&&(a1.type in {circle:1,ellipse:1}||(aW.fill+ai).charAt()!="r")&&b(a1,aW.fill)){aX.fill="none";aX.gradient=aW.fill;}}}aY&&aU[aA](aV);var S=(aU.getElementsByTagName("stroke")&&aU.getElementsByTagName("stroke")[0]),aZ=false;!S&&(aZ=S=Y("stroke"));if((aW.stroke&&aW.stroke!="none")||aW["stroke-width"]||aW["stroke-opacity"]!=null||aW["stroke-dasharray"]||aW["stroke-miterlimit"]||aW["stroke-linejoin"]||aW["stroke-linecap"]){S.on=true;}(aW.stroke=="none"||S.on==null||aW.stroke==0||aW["stroke-width"]==0)&&(S.on=false);S.on&&aW.stroke&&(S.color=af.getRGB(aW.stroke).hex);var i=((+aX["stroke-opacity"]+1||2)-1)*((+aX.opacity+1||2)-1),aS=(N(aW["stroke-width"])||1)*0.75;i<0&&(i=0);i>1&&(i=1);aW["stroke-width"]==null&&(aS=aX["stroke-width"]);aW["stroke-width"]&&(S.weight=aS);aS&&aS<1&&(i*=aS)&&(S.weight=1);S.opacity=i;aW["stroke-linejoin"]&&(S.joinstyle=aW["stroke-linejoin"]||"miter");S.miterlimit=aW["stroke-miterlimit"]||8;aW["stroke-linecap"]&&(S.endcap=aW["stroke-linecap"]=="butt"?"flat":aW["stroke-linecap"]=="square"?"square":"round");if(aW["stroke-dasharray"]){var aT={"-":"shortdash",".":"shortdot","-.":"shortdashdot","-..":"shortdashdotdot",". ":"dot","- ":"dash","--":"longdash","- .":"dashdot","--.":"longdashdot","--..":"longdashdotdot"};S.dashstyle=aT[J](aW["stroke-dasharray"])?aT[aW["stroke-dasharray"]]:ai;}aZ&&aU[aA](S);}if(a1.type=="text"){var aO=a1.paper.span.style;aX.font&&(aO.font=aX.font);aX["font-family"]&&(aO.fontFamily=aX["font-family"]);aX["font-size"]&&(aO.fontSize=aX["font-size"]);aX["font-weight"]&&(aO.fontWeight=aX["font-weight"]);aX["font-style"]&&(aO.fontStyle=aX["font-style"]);a1.node.string&&(a1.paper.span.innerHTML=(a1.node.string+ai)[aD](/"));a1.W=aX.w=a1.paper.span.offsetWidth;a1.H=aX.h=a1.paper.span.offsetHeight;a1.X=aX.x;a1.Y=aX.y+H(a1.H/2);switch(aX["text-anchor"]){case"start":a1.node.style["v-text-align"]="left";a1.bbx=H(a1.W/2);break;case"end":a1.node.style["v-text-align"]="right";a1.bbx=-H(a1.W/2);break;default:a1.node.style["v-text-align"]="center";break;}}};var b=function(e,aP){e.attrs=e.attrs||{};var aQ=e.attrs,aS=e.node.getElementsByTagName("fill"),aN="linear",aO=".5 .5";e.attrs.gradient=aP;aP=(aP+ai)[aD](/^r(?:$([^,]+?)\s*,\s*([^$]+?)\))?/,function(aU,aV,i){aN="radial";if(aV&&i){aV=N(aV);i=N(i);if(aB(aV-0.5,2)+aB(i-0.5,2)>0.25){i=Math.sqrt(0.25-aB(aV-0.5,2))+0.5;}aO=aV+ae+i;}return ai;});aP=aP[u](/\s*\-\s*/);if(aN=="linear"){var E=aP.shift();E=-N(E);if(isNaN(E)){return null;}}var S=n(aP);if(!S){return null;}e=e.shape||e.node;aS=aS[0]||Y("fill");if(S[l]){aS.on=true;aS.method="none";aS.type=(aN=="radial")?"gradientradial":"gradient";aS.color=S[0].color;aS.color2=S[S[l]-1].color;var aT=[];for(var R=0,aR=S[l];R');};}catch(X){var Y=function(e){return D.createElement("<"+e+' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');};}var s=function(){var R=ag[aJ](null,arguments),i=R.container,aR=R.height,aS,E=R.width,aQ=R.x,aP=R.y;if(!i){throw new Error("VML container not found.");}var aN={},aO=aN.canvas=D.createElement("div"),S=aO.style;E=E||512;aR=aR||342;E==+E&&(E+="px");aR==+aR&&(aR+="px");aN.width=1000;aN.height=1000;aN.coordsize="1000 1000";aN.coordorigin="0 0";aN.span=D.createElement("span");aN.span.style.cssText="position:absolute;left:-9999px;top:-9999px;padding:0;margin:0;line-height:1;display:inline;";aO[aA](aN.span);S.cssText=af.format("width:{0};height:{1};position:absolute;clip:rect(0 {0} {1} 0);overflow:hidden",E,aR);if(i==1){D.body[aA](aO);S.left=aQ+"px";S.top=aP+"px";i={style:{width:E,height:aR}};}else{i.style.width=E;i.style.height=aR;if(i.firstChild){i.insertBefore(aO,i.firstChild);}else{i[aA](aO);}}for(var e in aE){if(aE[J](e)){aN[e]=aE[e];}}av.call(aN,aN,af.fn);aN.top=aN.bottom=null;aN.raphael=af;return aN;};aE.clear=function(){this.canvas.innerHTML=ai;this.bottom=this.top=null;};aE.remove=function(){this.canvas.parentNode.removeChild(this.canvas);for(var e in this){delete this[e];}};}if({"Apple Computer, Inc.":1,"Google Inc.":1}[navigator.vendor]&&!(navigator.userAgent.indexOf("Version/4.0")+1)){aE.safari=function(){var e=this.rect(-99,-99,this.width+99,this.height+99);setTimeout(function(){e.remove();});};}else{aE.safari=function(){};}var W=(function(){if(D.addEventListener){return function(S,E,i,e){var R=function(aN){return i.call(e,aN);};S.addEventListener(E,R,false);return function(){S.removeEventListener(E,R,false);return true;};};}else{if(D.attachEvent){return function(aN,R,E,i){var S=function(aO){return E.call(i,aO||aj.event);};aN.attachEvent("on"+R,S);var e=function(){aN.detachEvent("on"+R,S);return true;};if(R=="mouseover"){aN.attachEvent("onmouseenter",S);return function(){aN.detachEvent("onmouseenter",S);return e();};}else{if(R=="mouseout"){aN.attachEvent("onmouseleave",S);return function(){aN.detachEvent("onmouseleave",S);return e();};}}return e;};}}})();for(var U=y[l];U--;){(function(e){am[aL][e]=function(i){if(af.is(i,"function")){this.events=this.events||{};this.events[e]=this.events[e]||{};this.events[e][i]=this.events[e][i]||[];this.events[e][i][d](W(this.shape||this.node,e,i,this));}return this;};am[aL]["un"+e]=function(i){var E=this.events;E&&E[e]&&E[e][i]&&E[e][i][l]&&E[e][i].shift()()&&!E[e][i][l]&&delete E[e][i];return this;};})(y[U]);}am[aL].hover=function(i,e){return this.mouseover(i).mouseout(e);};aE.circle=function(e,E,i){return I(this,e||0,E||0,i||0);};aE.rect=function(e,S,i,E,R){return au(this,e||0,S||0,i||0,E||0,R||0);};aE.ellipse=function(e,R,E,i){return Z(this,e||0,R||0,E||0,i||0);};aE.path=function(e){e&&!af.is(e,"string")&&!af.is(e[0],"array")&&(e+=ai);return o(af.format[aJ](af,arguments),this);};aE.image=function(R,e,S,i,E){return m(this,R||"about:blank",e||0,S||0,i||0,E||0);};aE.text=function(e,E,i){return O(this,e||0,E||0,i||ai);};aE.set=function(e){arguments[l]>1&&(e=Array[aL].splice.call(arguments,0,arguments[l]));return new K(e);};aE.setSize=aI;am[aL].scale=function(aX,aW,R,E){if(aX==null&&aW==null){return{x:this._.sx,y:this._.sy,toString:function(){return this.x+ae+this.y;}};}aW=aW||aX;!+aW&&(aW=aX);var a1,aZ,a0,aY,bd=this.attrs;if(aX!=0){var aU=this.getBBox(),aR=aU.x+aU.width/2,aN=aU.y+aU.height/2,bc=aX/this._.sx,ba=aW/this._.sy;R=(+R||R==0)?R:aR;E=(+E||E==0)?E:aN;var aT=~~(aX/Math.abs(aX)),aQ=~~(aW/Math.abs(aW)),a4=this.node.style,bf=R+(aR-R)*bc,be=E+(aN-E)*ba;switch(this.type){case"rect":case"image":var aS=bd.width*aT*bc,a3=bd.height*aQ*ba,aV=bd.r*ax(bc,ba),aP=bf-aS/2,S=be-a3/2;this.attr({width:aS,height:a3,x:aP,y:S,r:aV});break;case"circle":case"ellipse":this.attr({rx:bd.rx*aT*bc,ry:bd.ry*aQ*ba,r:bd.r*ax(aT*bc,aQ*ba),cx:bf,cy:be});break;case"path":var a6=V(bd.path),a7=true;for(var a9=0,a2=a6[l];a9":function(e){return aB(e-1,3)+1;},"<>":function(e){e=e*2;if(e<1){return aB(e,3)/2;}e-=2;return(aB(e,3)+2)/2;},backIn:function(i){var e=1.70158;return i*i*((e+1)*i-e);},backOut:function(i){i=i-1;var e=1.70158;return i*i*((e+1)*i+e)+1;},elastic:function(E){if(E==0||E==1){return E;}var i=0.3,e=i/4;return aB(2,-10*E)*Math.sin((E-e)*(2*Math.PI)/i)+1;},bounce:function(R){var i=7.5625,E=2.75,e;if(R<(1/E)){e=i*R*R;}else{if(R<(2/E)){R-=(1.5/E);e=i*R*R+0.75;}else{if(R<(2.5/E)){R-=(2.25/E);e=i*R*R+0.9375;}else{R-=(2.625/E);e=i*R*R+0.984375;}}}return e;}};var B={length:0},aF=function(){var aQ=+new Date;for(var a1 in B){if(a1!="length"&&B[J](a1)){var a6=B[a1];if(a6.stop){delete B[a1];B[l]--;continue;}var aO=aQ-a6.start,aZ=a6.ms,aY=a6.easing,a2=a6.from,aV=a6.diff,R=a6.to,aU=a6.t,aX=a6.prev||0,aP=a6.el,S=a6.callback,aW={},E;if(aO255?255:(e<0?0:e);},q=function(e,E){if(e==null){return{x:this._.tx,y:this._.ty};}this._.tx+=+e;this._.ty+=+E;switch(this.type){case"circle":case"ellipse":this.attr({cx:+e+this.attrs.cx,cy:+E+this.attrs.cy});break;case"rect":case"image":case"text":this.attr({x:+e+this.attrs.x,y:+E+this.attrs.y});break;case"path":var i=V(this.attrs.path);i[0][1]+=+e;i[0][2]+=+E;this.attr({path:i});break;}return this;};am[aL].animateWith=function(i,E,e,S,R){B[i.id]&&(E.start=B[i.id].start);return this.animate(E,e,S,R);};am[aL].onAnimation=function(e){this._run=e||null;return this;};am[aL].animate=function(R,e,aS,aY){if(af.is(aS,"function")||!aS){aY=aS||null;}var aT={},aU={},aV={};for(var aR in R){if(R[J](aR)){if(Q[J](aR)){aT[aR]=this.attr(aR);(aT[aR]==null)&&(aT[aR]=h[aR]);aU[aR]=R[aR];switch(Q[aR]){case"number":aV[aR]=(aU[aR]-aT[aR])/e;break;case"colour":aT[aR]=af.getRGB(aT[aR]);var aP=af.getRGB(aU[aR]);aV[aR]={r:(aP.r-aT[aR].r)/e,g:(aP.g-aT[aR].g)/e,b:(aP.b-aT[aR].b)/e};break;case"path":var E=A(aT[aR],aU[aR]);aT[aR]=E[0];aU[aR]=E[1];aV[aR]=[];for(var aO=0,aX=aT[aR][l];aO 0 && t1 < 1 ? t1 : 0), - dot2 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2 > 0 && t2 < 1 ? t2 : 0); - x = x[concat](dot1.x, dot2.x); - y = y[concat](dot1.y, dot2.y); + dot; + !isFinite(t1) && (t1 = .5); + !isFinite(t2) && (t2 = .5); + if (t1 > 0 && t1 < 1) { + dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1); + x[push](dot.x); + y[push](dot.y); + } + if (t2 > 0 && t2 < 1) { + dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2); + x[push](dot.x); + y[push](dot.y); + } a = (c2y - 2 * c1y + p1y) - (p2y - 2 * c2y + c1y); b = 2 * (c1y - p1y) - 2 * (c2y - c1y); c = p1y - c1y; t1 = (-b + Math.sqrt(b * b - 4 * a * c)) / 2 / a; t2 = (-b - Math.sqrt(b * b - 4 * a * c)) / 2 / a; - dot1 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1 > 0 && t1 < 1 ? t1 : 0); - dot2 = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2 > 0 && t2 < 1 ? t2 : 0); - x = x[concat](dot1.x, dot2.x); - y = y[concat](dot1.y, dot2.y); + !isFinite(t1) && (t1 = .5); + !isFinite(t2) && (t2 = .5); + if (t1 > 0 && t1 < 1) { + dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1); + x[push](dot.x); + y[push](dot.y); + } + if (t2 > 0 && t2 < 1) { + dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2); + x[push](dot.x); + y[push](dot.y); + } return { min: {x: mmin[apply](0, x), y: mmin[apply](0, y)}, max: {x: mmax[apply](0, x), y: mmax[apply](0, y)} @@ -869,27 +898,27 @@ window.Raphael = (function () { return +num + (~~num === num) * .5; }, roundPath = function (path) { - for (var i = 0, ii = path[length]; i < ii; i++) { - if (lowerCase.call(path[i][0]) != "a") { - for (var j = 1, jj = path[i][length]; j < jj; j++) { - path[i][j] = round(path[i][j]); + for (var i = 0, ii = path[length]; i < ii; i++) { + if (lowerCase.call(path[i][0]) != "a") { + for (var j = 1, jj = path[i][length]; j < jj; j++) { + path[i][j] = round(path[i][j]); + } + } else { + path[i][6] = round(path[i][6]); + path[i][7] = round(path[i][7]); } - } else { - path[i][6] = round(path[i][6]); - path[i][7] = round(path[i][7]); } - } - return path; - }, + return path; + }, $ = function (el, attr) { - if (attr) { - for (var key in attr) if (attr[has](key)) { - el[setAttribute](key, attr[key]); + if (attr) { + for (var key in attr) if (attr[has](key)) { + el[setAttribute](key, attr[key]); + } + } else { + return doc.createElementNS(paper.svgns, el); } - } else { - return doc.createElementNS(paper.svgns, el); - } - }; + }; R[toString] = function () { return "Your browser supports SVG.\nYou are running Rapha\xebl " + this.version; }; @@ -1382,6 +1411,9 @@ window.Raphael = (function () { if (arguments[0] == "scale") { return this.scale(); } + if (arguments[0] == "fill" && this.attrs.fill == "none" && this.attrs.gradient) { + return this.attrs.gradient; + } return this.attrs[arguments[0]]; } if (arguments[length] == 1 && R.is(arguments[0], "array")) { @@ -2001,7 +2033,7 @@ window.Raphael = (function () { (os.top != y - top + "px") && (os.top = y - top + "px"); (os.width != w + "px") && (os.width = w + "px"); (os.height != h + "px") && (os.height = h + "px"); - var arcsize = (+params.r || 0) / (mmin(w, h)); + var arcsize = (+params.r || 0) / mmin(w, h); if (this.type == "rect" && this.arcsize != arcsize && (arcsize || this.arcsize)) { // We should replace element with the new one var o = createNode(arcsize ? "roundrect" : "rect"); @@ -2041,7 +2073,7 @@ window.Raphael = (function () { return; } tear(this, this.paper); - this.node.parentNode.removeChild(this[0]); + this.node.parentNode.removeChild(this.node); this.Group.parentNode.removeChild(this.Group); this.shape && this.shape.parentNode.removeChild(this.shape); for (var i in this) { @@ -2070,6 +2102,9 @@ window.Raphael = (function () { if (arguments[0] == "scale") { return this.scale(); } + if (arguments[0] == "fill" && this.attrs.fill == "none" && this.attrs.gradient) { + return this.attrs.gradient; + } return this.attrs[arguments[0]]; } if (this.attrs && arguments[length] == 1 && R.is(arguments[0], "array")) { @@ -2153,18 +2188,18 @@ window.Raphael = (function () { }; var theRect = function (vml, x, y, w, h, r) { var g = createNode("group"), - o = createNode(r ? "roundrect" : "rect"), + o = createNode("roundrect"), arcsize = (+r || 0) / (mmin(w, h)); - o.arcsize = arcsize; g.style.cssText = "position:absolute;left:0;top:0;width:" + vml.width + "px;height:" + vml.height + "px"; g.coordsize = vml.coordsize; g.coordorigin = vml.coordorigin; g[appendChild](o); + o.arcsize = arcsize; var res = new Element(o, g, vml); res.type = "rect"; setFillAndStroke(res, {stroke: "#000"}); res.arcsize = arcsize; - res.setBox({x: x, y: y, width: w, height: h, r: +r}); + res.setBox({x: x, y: y, width: w, height: h, r: r}); vml.canvas[appendChild](g); return res; }; @@ -2490,7 +2525,7 @@ window.Raphael = (function () { } else { skip = false; } - if (R.svg && P0 == "A") { + if (P0 == "A") { p[path[i][length] - 2] *= kx; p[path[i][length] - 1] *= ky; p[1] *= dirx * kx; -- 2.39.2