--- ray/src/px/falsecolor.csh	1991/05/27 09:00:38	1.5
+++ ray/src/px/falsecolor.csh	1991/08/09 15:13:15	1.8
@@ -79,6 +79,7 @@ while ($#argv > 0)
 end
 mkdir $td
 cat > $td/pc0.cal <<_EOF_
+PI : 3.14159265358979323846 ;
 scale : $scale ;
 mult : $mult ;
 ndivs : $ndivs ;
@@ -86,12 +87,12 @@ ndivs : $ndivs ;
 or(a,b) : if(a,a,b);
 EPS : 1e-7;
 neq(a,b) : if(a-b-EPS,1,b-a-EPS);
-btwn(a,b) : if(a-x,-1,b-x);
+btwn(a,x,b) : if(a-x,-1,b-x);
 clip(x) : if(x-1,1,if(x,x,0));
 frac(x) : x - floor(x);
 boundary(a,b) : neq(floor(ndivs*a),floor(ndivs*b));
 
-isconta = or(boundary(vleft,vright),boundary(vabove,vbelow));
+isconta = if(btwn(0,v,1),or(boundary(vleft,vright),boundary(vabove,vbelow)),-1);
 iscontb = if(btwn(0,v,1),btwn(.4,frac(ndivs*v),.6),-1); 
 
 ro = if(in,clip($redv),ra);