===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/if.c,v
retrieving revision 1.14
retrieving revision 1.18
diff -u -p -r1.14 -r1.18
--- OpenXM_contrib2/asir2000/plot/if.c	2002/08/02 09:44:37	1.14
+++ OpenXM_contrib2/asir2000/plot/if.c	2005/08/04 04:34:49	1.18
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.13 2002/08/02 09:29:17 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.17 2005/05/18 03:27:00 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -114,7 +114,7 @@ int plot(NODE arg)
 		can->mode = xrange ? MODE_PLOT : MODE_POLARPLOT;
 
 	if ( zrange ) {
-		n = BDY(zrange); v = VR((P)BDY(n)); n = NEXT(n);
+		n = NEXT(BDY(zrange));
 		can->zmin = ToReal(BDY(n)); 
 		n = NEXT(n); can->zmax = ToReal(BDY(n));
 		n = NEXT(n);
@@ -122,7 +122,7 @@ int plot(NODE arg)
 			can->nzstep = n ? QTOS((Q)BDY(n)) : MAXGC;
 		else {
 			/* XXX */
-			can->vx = v;
+			can->vx = VR((P)BDY(BDY(zrange)));
 			can->nzstep = n ? QTOS((Q)BDY(n)) : DEFAULTPOLARSTEP;
 		}
 	}
@@ -234,6 +234,13 @@ int plotover(NODE arg)
 		if ( vl0->v->attr == (pointer)V_IND )
 			if ( vl->v != can->vx && vl->v != can->vy )
 				return -1;
+	if ( argc(arg) == 3 )
+		can->color = QTOS((Q)ARG2(arg));
+	else
+		can->color = 0;
+#if !defined(VISUAL)
+	set_drawcolor(can->color);
+#endif
 	current_can = can;
 	fakecan = *can; fakecan.formula = formula;
 	if ( can->mode == MODE_PLOT ) {
@@ -307,18 +314,21 @@ int draw_obj(NODE arg)
 		case 2: /* point */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
 			draw_point(display,can,x,y,color);
-			MKRVECT2(vect,x,y); MKNODE(n,vect,can->history); can->history = n;
+			MKRVECT3(vect,x,y,color); MKNODE(n,vect,can->history);
+			can->history = n;
 			break;
 		case 3: /* circle */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
 			r = (int)ToReal((Q)ARG2(obj));
-			MKRVECT3(vect,x,y,r); MKNODE(n,vect,can->history); can->history = n;
+			MKRVECT4(vect,x,y,r,color); MKNODE(n,vect,can->history);
+			can->history = n;
 			break;
 		case 4: /* line */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
 			u = (int)ToReal((Q)ARG2(obj)); v = (int)ToReal((Q)ARG3(obj));
 			draw_line(display,can,x,y,u,v,color);
-			MKRVECT4(vect,x,y,u,v); MKNODE(n,vect,can->history); can->history = n;
+			MKRVECT5(vect,x,y,u,v,color); MKNODE(n,vect,can->history);
+			can->history = n;
 			break;
 		default:
 			set_lasterror("draw_obj : invalid request");