Index: trunk/Ohana/src/opihi/cmd.data/plot.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/plot.c	(revision 5850)
+++ trunk/Ohana/src/opihi/cmd.data/plot.c	(revision 7080)
@@ -3,57 +3,9 @@
 int plot (int argc, char **argv) {
   
-  int N, Npts, Ngraph;
+  int N, Npts;
   Graphdata graphmode;
   Vector *xvec, *yvec, *dxmvec, *dxpvec, *dymvec, *dypvec;
 
-  /* choose the appropriate graphing window */
-  Ngraph = -1;
-  if ((N = get_argument (argc, argv, "-n"))) {
-    remove_argument (N, &argc, argv);
-    Ngraph = atof (argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-  if (!GetGraph (&graphmode, NULL, &Ngraph)) return (FALSE);
-
-  /* evaluate various plotting options */
-  if ((N = get_argument (argc, argv, "-lt"))) {
-    remove_argument (N, &argc, argv);
-    graphmode.ltype = atof(argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-  if ((N = get_argument (argc, argv, "-lw"))) {
-    remove_argument (N, &argc, argv);
-    graphmode.lweight = atof(argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-  if ((N = get_argument (argc, argv, "-pt"))) {
-    remove_argument (N, &argc, argv);
-    graphmode.ptype = atof(argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-  if ((N = get_argument (argc, argv, "+eb"))) {
-    remove_argument (N, &argc, argv);
-    graphmode.ebar = TRUE;
-  }
-  if ((N = get_argument (argc, argv, "-eb"))) {
-    remove_argument (N, &argc, argv);
-    graphmode.ebar = FALSE;
-  }
-  if ((N = get_argument (argc, argv, "-sz"))) {
-    remove_argument (N, &argc, argv);
-    graphmode.size = atof(argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-  if ((N = get_argument (argc, argv, "-c"))) {
-    remove_argument (N, &argc, argv);
-    graphmode.color = KapaColorByName (argv[N]);
-    if (graphmode.color == -1) return (FALSE);
-    remove_argument (N, &argc, argv);
-  }
-  if ((N = get_argument (argc, argv, "-x"))) {
-    remove_argument (N, &argc, argv);
-    graphmode.style = atof(argv[N]);
-    remove_argument (N, &argc, argv);
-  }
+  if (!style_args (&graphmode, &argc, argv, -1)) return FALSE;
 
   /* decide on error bars */
@@ -81,9 +33,7 @@
 
   if (argc != 3) {
-    fprintf (stderr, "USAGE: plot <x> <y>\n");
+    fprintf (stderr, "USAGE: plot <x> <y> [style]\n");
     return (FALSE);
   }
-
-  /* set plotting options (these are sticky) */
   SetGraph (graphmode);
 
@@ -92,8 +42,8 @@
   if ((dymvec != NULL) && (dypvec == NULL)) dypvec = dymvec;
   if ((dypvec != NULL) && (dymvec == NULL)) dymvec = dypvec;
-  if (dypvec != NULL) graphmode.etype |= 0x01;
+  if ((dypvec != NULL) || (dymvec != NULL)) graphmode.etype |= 0x01;
   if ((dxmvec != NULL) && (dxpvec == NULL)) dxpvec = dxmvec;
   if ((dxpvec != NULL) && (dxmvec == NULL)) dxmvec = dxpvec;
-  if (dxpvec != NULL) graphmode.etype |= 0x02;
+  if ((dxpvec != NULL) || (dxmvec != NULL)) graphmode.etype |= 0x02;
   
   /* find vectors */