# HG changeset patch
# User jwe
# Date 1110999292 0
# Node ID 32c569794216f27ba66c10daf5b5ae98064a2f97
# Parent  eecc24b92d97776524dcfd741bc1c4a30fb7329d
[project @ 2005-03-16 18:54:42 by jwe]

diff -r eecc24b92d97 -r 32c569794216 doc/interpreter/plot.txi
--- a/doc/interpreter/plot.txi	Wed Mar 16 17:14:12 2005 +0000
+++ b/doc/interpreter/plot.txi	Wed Mar 16 18:54:52 2005 +0000
@@ -281,28 +281,7 @@
 but not @code{rand (5, 30)}.
 @end deffn
 
-@deffn {Command} gset options
-@deffnx {Command} gshow options
-@deffnx {Command} replot options
-In addition to the basic plotting commands, the whole range of
-@code{gset} and @code{gshow} commands from @code{gnuplot} are available,
-as is @code{replot}.
-
-@findex set
-@findex show
-Note that in Octave 2.0, the @code{set} and @code{show} commands were
-renamed to @code{gset} and @code{gshow} in order to allow for
-compatibility with the @sc{Matlab} graphics and GUI commands in a future
-version of Octave.  (For now, the old @code{set} and @code{show}
-commands do work, but they print an annoying warning message to try to
-get people to switch to using @code{gset} and @code{gshow}.)
-
-The @code{gset} and @code{gshow} commands allow you to set and show
-@code{gnuplot} parameters.  For more information about the @code{gset}
-and @code{gshow} commands, see the documentation for @code{set} and
-@code{show} in the @code{gnuplot} user's guide (also available on line
-if you run @code{gnuplot} directly, instead of running it from Octave).
-
+@deffn {Command} replot options
 The @code{replot} command allows you to force the plot to be
 redisplayed.  This is useful if you have changed something about the
 plot, such as the title or axis labels.  The @code{replot} command also
@@ -337,8 +316,7 @@
 time something as minor as an axis label changes.
 
 @findex shg
-The command @code{shg} is equivalent to executing @code{replot} without
-any arguments.
+The command @code{shg} is equivalent to executing @code{replot}.
 @end deffn
 
 Note that NaN values in the plot data are automatically omitted, and
@@ -356,8 +334,6 @@
 
 @DOCSTRING(gnuplot_has_frames)
 
-@DOCSTRING(graw)
-
 @DOCSTRING(gnuplot_command_plot)
 
 @DOCSTRING(gnuplot_command_replot)
diff -r eecc24b92d97 -r 32c569794216 scripts/ChangeLog
--- a/scripts/ChangeLog	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/ChangeLog	Wed Mar 16 18:54:52 2005 +0000
@@ -1,15 +1,24 @@
 2005-03-16  John W. Eaton  <jwe@octave.org>
 
-	* __axis_label__.m, __errplot__.m, __plt__.m, axis.m, bar.m,
-	bottom_title.m, contour.m, errorbar.m, figure.m, grid.m, loglog.m,
-	loglogerr.m, mesh.m, meshgrid.m, mplot.m, multiplot.m, oneplot.m,
-	plot.m, plot_border.m, polar.m, semilogx.m, semilogxerr.m,
-	semilogy.m, semilogyerr.m, shg.m, stairs.m, subplot.m,
-	subwindow.m, title.m, top_title.m, xlabel.m: Use __gplot__ instead
-	of gplot, __gsplot__ instead of gsplot, __gset__ instead of gset.
-	Remove gplot, gsplot from @seealso docs.
-
-2005-03-16  John W. Eaton  <jwe@octave.org>
+	* control/base/__stepimp__.m, control/base/bode.m,
+	control/base/frdemo.m, control/base/nichols.m,
+	control/base/nyquist.m, control/base/pzmap.m,
+	control/base/rldemo.m, control/base/rlocus.m,
+	control/hinf/dhinfdemo.m, control/hinf/hinfdemo.m,
+	plot/__axis_label__.m, plot/__errplot__.m, plot/__plt__.m,
+	plot/axis.m, plot/bar.m, plot/bottom_title.m, plot/contour.m,
+	plot/errorbar.m, plot/figure.m, plot/grid.m, plot/loglog.m,
+	plot/loglogerr.m, plot/mesh.m, plot/meshgrid.m, plot/mplot.m,
+	plot/multiplot.m, plot/oneplot.m, plot/plot.m, plot/plot_border.m,
+	plot/polar.m, plot/semilogx.m, plot/semilogxerr.m,
+	plot/semilogy.m, plot/semilogyerr.m, plot/shg.m, plot/stairs.m,
+	plot/subplot.m, plot/subwindow.m, plot/title.m, plot/top_title.m,
+	plot/xlabel.m, quaternion/demoquat.m,
+	quaternion/qcoordinate_plot.m, signal/freqz_plot.m, sparse/spy.m,
+	statistics/base/ppplot.m, statistics/base/qqplot.m:
+	Use __gnuplot_plot__ instead of gplot, __gnuplot_splot__ instead
+	of gsplot, and __gnuplot_set__ instead of gset. Remove gplot,
+	gsplot from @seealso docs.
 
 	* plot/replot.m: New file.
 
diff -r eecc24b92d97 -r 32c569794216 scripts/control/base/__stepimp__.m
--- a/scripts/control/base/__stepimp__.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/control/base/__stepimp__.m	Wed Mar 16 18:54:52 2005 +0000
@@ -220,10 +220,10 @@
     if(nargout == 0)
       ## Plot the information
       oneplot();
-      gset nogrid
-      gset nologscale
-      gset autoscale
-      gset nokey
+      __gnuplot_set__ nogrid
+      __gnuplot_set__ nologscale
+      __gnuplot_set__ autoscale
+      __gnuplot_set__ nokey
       if (IMPULSE)
 	gm = zeros(NOUT, 1);
 	tt = "impulse";
diff -r eecc24b92d97 -r 32c569794216 scripts/control/base/bode.m
--- a/scripts/control/base/bode.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/control/base/bode.m	Wed Mar 16 18:54:52 2005 +0000
@@ -148,10 +148,10 @@
     unwind_protect
       automatic_replot = 0;
       oneplot();
-      gset autoscale;
-      gset nokey;
+      __gnuplot_set__ autoscale;
+      __gnuplot_set__ nokey;
       clearplot();
-      gset data style lines;
+      __gnuplot_set__ data style lines;
       if(is_digital(sys))
 	xlstr = ["Digital frequency w=rad/sec.  pi/T=",num2str(pi/systsam)];
 	tistr = "(exp(jwT)) ";
diff -r eecc24b92d97 -r 32c569794216 scripts/control/base/frdemo.m
--- a/scripts/control/base/frdemo.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/control/base/frdemo.m	Wed Mar 16 18:54:52 2005 +0000
@@ -545,9 +545,9 @@
           eval(cmd);
           disp("\nTo view the system's nyquist plot, execute the following");
           disp("commands:\n");
-          cmd = "gset xrange [-4:2];";
+          cmd = "__gnuplot_set__ xrange [-4:2];";
           disp(cmd); eval(cmd);
-          cmd = "gset yrange [-2.5:2.5];";
+          cmd = "__gnuplot_set__ yrange [-2.5:2.5];";
           disp(cmd); eval(cmd);
           cmd = "nyquist(dsys3);";
           run_cmd;
diff -r eecc24b92d97 -r 32c569794216 scripts/control/base/nichols.m
--- a/scripts/control/base/nichols.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/control/base/nichols.m	Wed Mar 16 18:54:52 2005 +0000
@@ -109,11 +109,11 @@
   if (nargout < 1),
     ## Plot the information
     oneplot();
-    gset autoscale;
-    gset nokey;
+    __gnuplot_set__ autoscale;
+    __gnuplot_set__ nokey;
     clearplot();
     grid("on");
-    gset data style lines;
+    __gnuplot_set__ data style lines;
     if(is_digital(sys))
       tistr = "(exp(jwT)) ";
     else
diff -r eecc24b92d97 -r 32c569794216 scripts/control/base/nyquist.m
--- a/scripts/control/base/nyquist.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/control/base/nyquist.m	Wed Mar 16 18:54:52 2005 +0000
@@ -135,10 +135,10 @@
     dnplot = 0;
     while(!dnplot)
       oneplot();
-      gset key;
+      __gnuplot_set__ key;
       clearplot();
       grid ("on");
-      gset data style lines;
+      __gnuplot_set__ data style lines;
 
       if(is_digital(sys))
         tstr = " G(e^{jw}) ";
@@ -154,7 +154,7 @@
           inn{1}, outn{1}, w(1), w(length(w))) )
       endif
 
-      gset nologscale xy;
+      __gnuplot_set__ nologscale xy;
 
       axis(axis2dlim([[vec(realp),vec(imagp)];[vec(realp),-vec(imagp)]]));
       plot(realp,imagp,"- ;+w;",realp,-imagp,"-@ ;-w;");
diff -r eecc24b92d97 -r 32c569794216 scripts/control/base/pzmap.m
--- a/scripts/control/base/pzmap.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/control/base/pzmap.m	Wed Mar 16 18:54:52 2005 +0000
@@ -66,7 +66,7 @@
     varstr = vars(is_digital(sys) + 1);
 
     ## Plot the data
-    gset nologscale xy;
+    __gnuplot_set__ nologscale xy;
     if(is_siso(sys))
       title(sprintf("Pole-zero map from %s to %s", ...
 	 sysgetsignals(sys,"in",1,1), sysgetsignals(sys,"out",1,1) ));
diff -r eecc24b92d97 -r 32c569794216 scripts/control/base/rldemo.m
--- a/scripts/control/base/rldemo.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/control/base/rldemo.m	Wed Mar 16 18:54:52 2005 +0000
@@ -35,7 +35,7 @@
         "Display root locus diagram of SISO continuous system (rlocus)", ...
         "Display root locus diagram of SISO discrete system (rlocus)", ...
         "Return to main demo menu");
-    gset autoscale
+    __gnuplot_set__ autoscale
     if (k == 1)
       clc
       help pzmap
diff -r eecc24b92d97 -r 32c569794216 scripts/control/base/rlocus.m
--- a/scripts/control/base/rlocus.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/control/base/rlocus.m	Wed Mar 16 18:54:52 2005 +0000
@@ -200,7 +200,7 @@
     axdata = [real(rlpolv(idx)),imag(rlpolv(idx))];
     axlim = axis2dlim(axdata);
     axlim(1:2) = [xmin, xmax];
-    gset nologscale xy;
+    __gnuplot_set__ nologscale xy;
     grid("on");
     rldata = [real(rlpolv), imag(rlpolv) ];
     axis(axlim);
diff -r eecc24b92d97 -r 32c569794216 scripts/control/hinf/dhinfdemo.m
--- a/scripts/control/hinf/dhinfdemo.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/control/hinf/dhinfdemo.m	Wed Mar 16 18:54:52 2005 +0000
@@ -150,7 +150,7 @@
     if (columns(mag2) > 1);  mag2 = mag2';  endif
     figure(fig_n)
     fig_n = fig_n + 1;
-    gset grid
+    __gnuplot_set__ grid
     loglog(ww, [mag1 mag2]);
   endif
 endif
diff -r eecc24b92d97 -r 32c569794216 scripts/control/hinf/hinfdemo.m
--- a/scripts/control/hinf/hinfdemo.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/control/hinf/hinfdemo.m	Wed Mar 16 18:54:52 2005 +0000
@@ -400,7 +400,7 @@
         if (columns(mag2) > 1);  mag2 = mag2';  endif
         figure(fig_n)
         fig_n = fig_n + 1;
-        gset grid
+        __gnuplot_set__ grid
         loglog(ww, [mag1 mag2]);
       endif
     endif
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/__axis_label__.m
--- a/scripts/plot/__axis_label__.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/__axis_label__.m	Wed Mar 16 18:54:52 2005 +0000
@@ -30,7 +30,7 @@
     usage ("__axis_label__ (caller, text)");
   elseif (nargin == 2)
     if (isstr (text))
-      eval (sprintf ("__gset__ %s \"%s\"", caller,
+      eval (sprintf ("__gnuplot_set__ %s \"%s\"", caller,
 		     undo_string_escapes (undo_string_escapes (text))));
       if (automatic_replot)
 	replot ();
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/__errplot__.m
--- a/scripts/plot/__errplot__.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/__errplot__.m	Wed Mar 16 18:54:52 2005 +0000
@@ -67,7 +67,7 @@
 	       a1(:,i)-a3(:,i), a1(:,i)+a4(:,i), ...
 	       a2(:,i)-a5(:,i), a2(:,i)+a6(:,i)];
     endswitch
-    cmd = sprintf ("__gplot__ tmp %s", ifmt);
+    cmd = sprintf ("__gnuplot_plot__ tmp %s", ifmt);
     eval (cmd);
 endfor
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/__plt__.m
--- a/scripts/plot/__plt__.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/__plt__.m	Wed Mar 16 18:54:52 2005 +0000
@@ -36,7 +36,7 @@
     y_set = false;
     have_gp_cmd = false;
 
-    gp_cmd = "__gplot__";
+    gp_cmd = "__gnuplot_plot__";
     sep = "";
 
     ## Gather arguments, decode format, gather plot strings, and plot lines.
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/axis.m
--- a/scripts/plot/axis.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/axis.m	Wed Mar 16 18:54:52 2005 +0000
@@ -129,7 +129,7 @@
 
   if (nargin == 0)
     if (nargout == 0)
-      __gset__ autoscale;
+      __gnuplot_set__ autoscale;
     else
       curr_axis = __current_axis__;
     endif
@@ -140,95 +140,95 @@
 
     ## 'matrix mode' to reverse the y-axis
     if (strcmp (ax, "ij"))
-      __gset__ yrange [] reverse; 
+      __gnuplot_set__ yrange [] reverse; 
     elseif (strcmp (ax, "xy"))
-      __gset__ yrange [] noreverse;
+      __gnuplot_set__ yrange [] noreverse;
 
       ## aspect ratio
     elseif (strcmp (ax, "image"))
-      __gset__ size ratio -1; 
-      __gset__ autoscale; ## XXX FIXME XXX should be the same as "tight"
+      __gnuplot_set__ size ratio -1; 
+      __gnuplot_set__ autoscale; ## XXX FIXME XXX should be the same as "tight"
     elseif (strcmp (ax, "equal"))
-      __gset__ size ratio -1;
+      __gnuplot_set__ size ratio -1;
     elseif (strcmp (ax, "square"))
-      __gset__ size ratio 1;
+      __gnuplot_set__ size ratio 1;
     elseif (strcmp (ax, "normal"))
-      __gset__ size noratio;
+      __gnuplot_set__ size noratio;
 
 
       ## axis limits
     elseif (len >= 4 && strcmp (ax(1:4), "auto"))
       if (len > 4)
-      	eval (sprintf ("__gset__ autoscale %s;", ax(5:len)));
+      	eval (sprintf ("__gnuplot_set__ autoscale %s;", ax(5:len)));
       else
-	__gset__ autoscale;
+	__gnuplot_set__ autoscale;
       endif
     elseif (strcmp (ax, "manual"))
       ## fixes the axis limits, like axis(axis) should;
-      __gset__ xrange [] writeback;
-      __gset__ yrange [] writeback;
-      __gset__ zrange [] writeback;
+      __gnuplot_set__ xrange [] writeback;
+      __gnuplot_set__ yrange [] writeback;
+      __gnuplot_set__ zrange [] writeback;
       ## XXX FIXME XXX if writeback were set in plot, no need to replot here.
       replot ();
-      __gset__ noautoscale x;
-      __gset__ noautoscale y;
-      __gset__ noautoscale z;
+      __gnuplot_set__ noautoscale x;
+      __gnuplot_set__ noautoscale y;
+      __gnuplot_set__ noautoscale z;
     elseif (strcmp (ax, "tight"))
       ## XXX FIXME XXX if tight, plot must set ranges to limits of the
       ## all the data on the current plot, even if from a previous call.
       ## Instead, just let gnuplot do as it likes.
-      __gset__ autoscale;
+      __gnuplot_set__ autoscale;
 
 
       ## tic marks
     elseif (strcmp (ax, "on"))
-      __gset__ xtics;
-      __gset__ ytics;
-      __gset__ ztics;
-      __gset__ format;
+      __gnuplot_set__ xtics;
+      __gnuplot_set__ ytics;
+      __gnuplot_set__ ztics;
+      __gnuplot_set__ format;
     elseif (strcmp (ax, "off"))
-      __gset__ noxtics;
-      __gset__ noytics;
-      __gset__ noztics;
+      __gnuplot_set__ noxtics;
+      __gnuplot_set__ noytics;
+      __gnuplot_set__ noztics;
     elseif (strcmp (ax, "tic"))
-      __gset__ xtics;
-      __gset__ ytics;
-      __gset__ ztics;
+      __gnuplot_set__ xtics;
+      __gnuplot_set__ ytics;
+      __gnuplot_set__ ztics;
     elseif (len > 3 && strcmp (ax(1:3), "tic"))
       if (any (ax == "x"))
-	__gset__ xtics;
+	__gnuplot_set__ xtics;
       else
-	__gset__ noxtics;
+	__gnuplot_set__ noxtics;
       endif
       if (any (ax == "y"))
-	__gset__ ytics;
+	__gnuplot_set__ ytics;
       else
-	__gset__ noytics;
+	__gnuplot_set__ noytics;
       endif
       if (any (ax == "z"))
-	__gset__ ztics;
+	__gnuplot_set__ ztics;
       else
-	__gset__ noztics;
+	__gnuplot_set__ noztics;
       endif
     elseif (strcmp (ax, "label"))
-      __gset__ format;
+      __gnuplot_set__ format;
     elseif (strcmp (ax, "nolabel"))
-      __gset__ format "\\0";
+      __gnuplot_set__ format "\\0";
     elseif (len > 5 && strcmp (ax(1:5), "label"))
       if (any (ax == "x"))
-	__gset__ format x;
+	__gnuplot_set__ format x;
       else
-	__gset__ format x "\\0";
+	__gnuplot_set__ format x "\\0";
       endif
       if (any (ax == "y"))
-	__gset__ format y;
+	__gnuplot_set__ format y;
       else
-	__gset__ format y "\\0";
+	__gnuplot_set__ format y "\\0";
       endif
       if (any (ax == "z"))
-	__gset__ format z;
+	__gnuplot_set__ format z;
       else
-	__gset__ format z "\\0";
+	__gnuplot_set__ format z "\\0";
       endif
 
     else
@@ -246,15 +246,15 @@
     __current_axis__ = reshape (ax, 1, len);
 
     if (len > 1)
-      eval (sprintf ("__gset__ xrange [%g:%g];", ax(1), ax(2)));
+      eval (sprintf ("__gnuplot_set__ xrange [%g:%g];", ax(1), ax(2)));
     endif
 
     if (len > 3)
-      eval (sprintf ("__gset__ yrange [%g:%g];", ax(3), ax(4)));
+      eval (sprintf ("__gnuplot_set__ yrange [%g:%g];", ax(3), ax(4)));
     endif
 
     if (len > 5)
-      eval (sprintf ("__gset__ zrange [%g:%g];", ax(5), ax(6)));
+      eval (sprintf ("__gnuplot_set__ zrange [%g:%g];", ax(5), ax(6)));
     endif
 
   else
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/bottom_title.m
--- a/scripts/plot/bottom_title.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/bottom_title.m	Wed Mar 16 18:54:52 2005 +0000
@@ -32,9 +32,9 @@
   endif
 
   if (isstr (text))
-    __gset__ top_title;
-    __gset__ title;
-    eval (sprintf ("__gset__ bottom_title \"%s\"",
+    __gnuplot_set__ top_title;
+    __gnuplot_set__ title;
+    eval (sprintf ("__gnuplot_set__ bottom_title \"%s\"",
 		   undo_string_escapes (undo_string_escapes (text))));
   else
     error ("bottom_title: text must be a string");
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/contour.m
--- a/scripts/plot/contour.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/contour.m	Wed Mar 16 18:54:52 2005 +0000
@@ -44,24 +44,24 @@
       n = y; 
     endif
     if (ismatrix (z))
-      __gset__ nosurface;
-      __gset__ contour;
-      __gset__ cntrparam bspline;
+      __gnuplot_set__ nosurface;
+      __gnuplot_set__ contour;
+      __gnuplot_set__ cntrparam bspline;
       if (isscalar (n))
-        command = sprintf ("__gset__ cntrparam levels %d", n);
+        command = sprintf ("__gnuplot_set__ cntrparam levels %d", n);
       elseif (isvector (n))
         tmp = sprintf ("%f", n(1));
         for i = 2:length (n)
           tmp = sprintf ("%s, %f", tmp, n(i));
         endfor
-        command = sprintf ("__gset__ cntrparam levels discrete %s", tmp);
+        command = sprintf ("__gnuplot_set__ cntrparam levels discrete %s", tmp);
       else
 	error ("contour: levels must be a scalar or vector") ;
       endif
       eval (command);
-      __gset__ noparametric;
-      __gset__ view 0, 0, 1, 1;
-      __gsplot__ z w l 1;
+      __gnuplot_set__ noparametric;
+      __gnuplot_set__ view 0, 0, 1, 1;
+      __gnuplot_splot__ z w l 1;
     else
       error ("contour: z of contour (z, levels) must be a matrix");
     endif
@@ -104,24 +104,24 @@
 	  error (size_msg);
 	endif
       endif
-      __gset__ nosurface;
-      __gset__ contour;
-      __gset__ cntrparam bspline;
+      __gnuplot_set__ nosurface;
+      __gnuplot_set__ contour;
+      __gnuplot_set__ cntrparam bspline;
       if (isscalar (n))
-        command = sprintf ("__gset__ cntrparam levels %d", n);
+        command = sprintf ("__gnuplot_set__ cntrparam levels %d", n);
       elseif (isvector (n))
         tmp = sprintf ("%f", n(1));
         for i = 2:length (n)
           tmp = sprintf ("%s, %f", tmp, n(i));
         endfor
-        command = sprintf ("__gset__ cntrparam levels discrete %s", tmp);
+        command = sprintf ("__gnuplot_set__ cntrparam levels discrete %s", tmp);
       else
 	error ("contour: levels must be a scalar or vector") ;
       endif
       eval (command);
-      __gset__ parametric;
-      __gset__ view 0, 0, 1, 1;
-      __gsplot__ zz w l 1;
+      __gnuplot_set__ parametric;
+      __gnuplot_set__ view 0, 0, 1, 1;
+      __gnuplot_splot__ zz w l 1;
     else
       error ("contour: x and y must be vectors and z must be a matrix");
     endif
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/errorbar.m
--- a/scripts/plot/errorbar.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/errorbar.m	Wed Mar 16 18:54:52 2005 +0000
@@ -117,9 +117,9 @@
     usage ("errorbar (...)");
   endif
 
-  __gset__ nologscale x;
-  __gset__ nologscale y;
-  __gset__ nopolar;
+  __gnuplot_set__ nologscale x;
+  __gnuplot_set__ nologscale y;
+  __gnuplot_set__ nopolar;
 
   __errcomm__ ("errorbar", varargin{:});
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/figure.m
--- a/scripts/plot/figure.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/figure.m	Wed Mar 16 18:54:52 2005 +0000
@@ -47,7 +47,7 @@
       if (! isempty (gnuterm))
         oneplot ();
         figure_list = union (figure_list, f);
-        eval (sprintf ("__gset__ term %s %d\n", gnuterm, f));
+        eval (sprintf ("__gnuplot_set__ term %s %d\n", gnuterm, f));
       else
         error ("figure: requires GNUTERM (Aqua) or DISPLAY (X11)");
       endif
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/grid.m
--- a/scripts/plot/grid.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/grid.m	Wed Mar 16 18:54:52 2005 +0000
@@ -38,15 +38,15 @@
   do_replot = false;
 
   if (nargin == 0)
-    __gset__ grid;
+    __gnuplot_set__ grid;
     do_replot = true;
   elseif (nargin == 1)
     if (isstr (x))
       if (strcmp ("off", x))
-        __gset__ nogrid;
+        __gnuplot_set__ nogrid;
 	do_replot = true;
       elseif (strcmp ("on", x))
-        __gset__ grid;
+        __gnuplot_set__ grid;
 	do_replot = true;
       else
 	usage (usage_msg);
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/loglog.m
--- a/scripts/plot/loglog.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/loglog.m	Wed Mar 16 18:54:52 2005 +0000
@@ -35,9 +35,9 @@
   ## temporarily, probably inside an unwind_protect block, but there is
   ## no way to determine their current values.
 
-  __gset__ logscale x;
-  __gset__ logscale y;
-  __gset__ nopolar;
+  __gnuplot_set__ logscale x;
+  __gnuplot_set__ logscale y;
+  __gnuplot_set__ nopolar;
 
   __plt__ ("loglog", varargin{:});
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/loglogerr.m
--- a/scripts/plot/loglogerr.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/loglogerr.m	Wed Mar 16 18:54:52 2005 +0000
@@ -48,9 +48,9 @@
     usage ("loglogerr(...)");
   endif
 
-  __gset__ logscale x;
-  __gset__ logscale y;
-  __gset__ nopolar;
+  __gnuplot_set__ logscale x;
+  __gnuplot_set__ logscale y;
+  __gnuplot_set__ nopolar;
 
   __errcomm__ ("loglogerr", varargin{:});
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/mesh.m
--- a/scripts/plot/mesh.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/mesh.m	Wed Mar 16 18:54:52 2005 +0000
@@ -41,14 +41,14 @@
   if (nargin == 1)
     z = x;
     if (ismatrix (z))
-      __gset__ hidden3d;
-      __gset__ data style lines;
-      __gset__ surface;
-      __gset__ nocontour;
-      __gset__ noparametric;
-      __gset__ nologscale;
-      __gset__ view 60, 30, 1, 1
-      __gsplot__ (z');
+      __gnuplot_set__ hidden3d;
+      __gnuplot_set__ data style lines;
+      __gnuplot_set__ surface;
+      __gnuplot_set__ nocontour;
+      __gnuplot_set__ noparametric;
+      __gnuplot_set__ nologscale;
+      __gnuplot_set__ view 60, 30, 1, 1
+      __gnuplot_splot__ (z');
     else
       error ("mesh: argument must be a matrix");
     endif
@@ -69,15 +69,15 @@
           zz(:,i+2) = z(:,k);
           k++;
         endfor
-        __gset__ hidden3d;
-        __gset__ data style lines;
-        __gset__ surface;
-        __gset__ nocontour;
-        __gset__ nologscale;
-        __gset__ parametric;
-        __gset__ view 60, 30, 1, 1
-        __gsplot__ (zz);
-        __gset__ noparametric;
+        __gnuplot_set__ hidden3d;
+        __gnuplot_set__ data style lines;
+        __gnuplot_set__ surface;
+        __gnuplot_set__ nocontour;
+        __gnuplot_set__ nologscale;
+        __gnuplot_set__ parametric;
+        __gnuplot_set__ view 60, 30, 1, 1
+        __gnuplot_splot__ (zz);
+        __gnuplot_set__ noparametric;
       else
         msg = "mesh: rows (z) must be the same as length (y) and";
         msg = sprintf ("%s\ncolumns (z) must be the same as length (x)", msg);
@@ -97,15 +97,15 @@
           zz(:,i+2) = z(:,k);
           k++;
         endfor
-        __gset__ hidden3d;
-        __gset__ data style lines;
-        __gset__ surface;
-        __gset__ nocontour;
-        __gset__ nologscale;
-        __gset__ parametric;
-        __gset__ view 60, 30, 1, 1
-        __gsplot__ (zz);
-        __gset__ noparametric;
+        __gnuplot_set__ hidden3d;
+        __gnuplot_set__ data style lines;
+        __gnuplot_set__ surface;
+        __gnuplot_set__ nocontour;
+        __gnuplot_set__ nologscale;
+        __gnuplot_set__ parametric;
+        __gnuplot_set__ view 60, 30, 1, 1
+        __gnuplot_splot__ (zz);
+        __gnuplot_set__ noparametric;
       else
         error ("mesh: x, y, and z must have same dimensions");
       endif
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/mplot.m
--- a/scripts/plot/mplot.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/mplot.m	Wed Mar 16 18:54:52 2005 +0000
@@ -44,8 +44,8 @@
   global __multiplot_xi__;
   global __multiplot_yi__;
 
-  __gset__ nologscale;
-  __gset__ nopolar;
+  __gnuplot_set__ nologscale;
+  __gnuplot_set__ nopolar;
 
   __plt__ ("plot", varargin{:});
 
@@ -67,7 +67,7 @@
     xo = (__multiplot_xi__ - 1.0) * __multiplot_xsize__;
     yo = (__multiplot_yn__ - __multiplot_yi__) * __multiplot_ysize__;
 
-    eval (sprintf ("__gset__ origin %g, %g", xo, yo));
+    eval (sprintf ("__gnuplot_set__ origin %g, %g", xo, yo));
 
   endif
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/multiplot.m
--- a/scripts/plot/multiplot.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/multiplot.m	Wed Mar 16 18:54:52 2005 +0000
@@ -73,17 +73,17 @@
       error ("multiplot: xn and yn have to be positive integers");
     endif
 
-    __gset__ multiplot;
+    __gnuplot_set__ multiplot;
 
     xsize = 1.0 ./ xn;
     ysize = 1.0 ./ yn;
 
-    eval (sprintf ("__gset__ size %g, %g", xsize, ysize));
+    eval (sprintf ("__gnuplot_set__ size %g, %g", xsize, ysize));
 
     xo = 0.0;
     yo = (yn - 1.0)*ysize;
 
-    eval (sprintf ("__gset__ origin %g, %g", xo, yo));
+    eval (sprintf ("__gnuplot_set__ origin %g, %g", xo, yo));
 
     __multiplot_mode__ = 1;
     __multiplot_xsize__ = xsize;
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/oneplot.m
--- a/scripts/plot/oneplot.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/oneplot.m	Wed Mar 16 18:54:52 2005 +0000
@@ -31,9 +31,9 @@
   global __multiplot_mode__ = 0;
 
   if (__multiplot_mode__)
-    __gset__ nomultiplot;
-    __gset__ size 1, 1;
-    __gset__ origin 0, 0;
+    __gnuplot_set__ nomultiplot;
+    __gnuplot_set__ size 1, 1;
+    __gnuplot_set__ origin 0, 0;
     __multiplot_mode__ = 0;
     gnuplot_command_replot = "rep";
   endif
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/plot.m
--- a/scripts/plot/plot.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/plot.m	Wed Mar 16 18:54:52 2005 +0000
@@ -175,8 +175,8 @@
   ## temporarily, probably inside an unwind_protect block, but there is
   ## no way to determine their current values.
 
-  __gset__ nologscale;
-  __gset__ nopolar;
+  __gnuplot_set__ nologscale;
+  __gnuplot_set__ nopolar;
 
   __plt__ ("plot", varargin{:});
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/plot_border.m
--- a/scripts/plot/plot_border.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/plot_border.m	Wed Mar 16 18:54:52 2005 +0000
@@ -100,14 +100,14 @@
   endwhile
 
   if (none)
-    __gset__ noborder;
+    __gnuplot_set__ noborder;
   else
     if (all)
       border = 15;
     else
       border = south + west + north + east;
     endif
-    eval (sprintf ("__gset__ border %d", border));
+    eval (sprintf ("__gnuplot_set__ border %d", border));
   endif
 
   if (automatic_replot)
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/polar.m
--- a/scripts/plot/polar.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/polar.m	Wed Mar 16 18:54:52 2005 +0000
@@ -36,8 +36,8 @@
   ## temporarily, probably inside an unwind_protect block, but there is
   ## no way to determine their current values.
 
-  __gset__ nologscale;
-  __gset__ nopolar;
+  __gnuplot_set__ nologscale;
+  __gnuplot_set__ nopolar;
 
   if (nargin == 3)
     if (isstr (fmt))
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/semilogx.m
--- a/scripts/plot/semilogx.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/semilogx.m	Wed Mar 16 18:54:52 2005 +0000
@@ -35,9 +35,9 @@
   ## temporarily, probably inside an unwind_protect block, but there is
   ## no way to determine their current values.
 
-  __gset__ logscale x;
-  __gset__ nologscale y;
-  __gset__ nopolar;
+  __gnuplot_set__ logscale x;
+  __gnuplot_set__ nologscale y;
+  __gnuplot_set__ nopolar;
 
   __plt__ ("semilogx", varargin{:});
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/semilogxerr.m
--- a/scripts/plot/semilogxerr.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/semilogxerr.m	Wed Mar 16 18:54:52 2005 +0000
@@ -48,9 +48,9 @@
     usage ("semilogxerr (...)");
   endif
 
-  __gset__ logscale x;
-  __gset__ nologscale y;
-  __gset__ nopolar;
+  __gnuplot_set__ logscale x;
+  __gnuplot_set__ nologscale y;
+  __gnuplot_set__ nopolar;
 
   __errcomm__ ("semilogxerr", varargin{:});
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/semilogy.m
--- a/scripts/plot/semilogy.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/semilogy.m	Wed Mar 16 18:54:52 2005 +0000
@@ -35,9 +35,9 @@
   ## temporarily, probably inside an unwind_protect block, but there is
   ## no way to determine their current values.
 
-  __gset__ nologscale x;
-  __gset__ logscale y;
-  __gset__ nopolar;
+  __gnuplot_set__ nologscale x;
+  __gnuplot_set__ logscale y;
+  __gnuplot_set__ nopolar;
 
   __plt__ ("semilogy", varargin{:});
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/semilogyerr.m
--- a/scripts/plot/semilogyerr.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/semilogyerr.m	Wed Mar 16 18:54:52 2005 +0000
@@ -48,9 +48,9 @@
     usage ("semilogyerr (...)");
   endif
 
-  __gset__ nologscale x;
-  __gset__ logscale y;
-  __gset__ nopolar;
+  __gnuplot_set__ nologscale x;
+  __gnuplot_set__ logscale y;
+  __gnuplot_set__ nopolar;
 
   __errcomm__ ("semilogyerr", varargin{:});
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/subplot.m
--- a/scripts/plot/subplot.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/subplot.m	Wed Mar 16 18:54:52 2005 +0000
@@ -24,7 +24,7 @@
 ## given by index (there are @var{cols} by @var{rows} subwindows).
 ##
 ## The global variable @var{__multiplot_scale__} should be used when the
-## command @code{__gset__ size xsize, ysize} has been used prior to calling
+## command @code{__gnuplot_set__ size xsize, ysize} has been used prior to calling
 ## @code{subplot}.
 ##
 ## The value of @var{__multiplot_scale__} should be a vector with two
@@ -157,9 +157,9 @@
 
       gnuplot_command_replot = "cle;rep";
 
-      __gset__ multiplot;
+      __gnuplot_set__ multiplot;
 
-      eval (sprintf ("__gset__ size %g, %g", __multiplot_xsize__,
+      eval (sprintf ("__gnuplot_set__ size %g, %g", __multiplot_xsize__,
                      __multiplot_ysize__));
     endif
 
@@ -175,7 +175,7 @@
     xo = (xp - 1.0) * __multiplot_xsize__;
     yo = (rows - yp) * __multiplot_ysize__;
 
-    eval (sprintf ("__gset__ origin %g, %g", xo, yo));
+    eval (sprintf ("__gnuplot_set__ origin %g, %g", xo, yo));
 
   endif
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/subwindow.m
--- a/scripts/plot/subwindow.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/subwindow.m	Wed Mar 16 18:54:52 2005 +0000
@@ -71,7 +71,7 @@
   xo = (xn - 1.0) * __multiplot_xsize__;
   yo = (__multiplot_yn__ - yn) * __multiplot_ysize__;
 
-  eval (sprintf ("__gset__ origin %g, %g", xo, yo));
+  eval (sprintf ("__gnuplot_set__ origin %g, %g", xo, yo));
 
   clearplot;
 
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/title.m
--- a/scripts/plot/title.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/title.m	Wed Mar 16 18:54:52 2005 +0000
@@ -34,7 +34,7 @@
   endif
 
   if (isstr (text))
-    eval (sprintf ("__gset__ title \"%s\"",
+    eval (sprintf ("__gnuplot_set__ title \"%s\"",
 		   undo_string_escapes (undo_string_escapes (text))));
     if (automatic_replot)
       replot ();
diff -r eecc24b92d97 -r 32c569794216 scripts/plot/top_title.m
--- a/scripts/plot/top_title.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/plot/top_title.m	Wed Mar 16 18:54:52 2005 +0000
@@ -34,9 +34,9 @@
   endif
 
   if (isstr (text))
-    __gset__ bottom_title;
-    __gset__ title;
-    eval (sprintf ("__gset__ top_title \"%s\"",
+    __gnuplot_set__ bottom_title;
+    __gnuplot_set__ title;
+    eval (sprintf ("__gnuplot_set__ top_title \"%s\"",
 		   undo_string_escapes (undo_string_escapes (text))));
     if (automatic_replot)
       replot ();
diff -r eecc24b92d97 -r 32c569794216 scripts/quaternion/demoquat.m
--- a/scripts/quaternion/demoquat.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/quaternion/demoquat.m	Wed Mar 16 18:54:52 2005 +0000
@@ -248,10 +248,10 @@
 	title(sprintf("yaw=%5.2f deg, pitch=%5.2f deg",thy,thp))
 	qcoordinate_plot(qi,qb,qview);
 	# uncomment the next four lines to get eps output
-	#gset terminal postscript eps 
-	#eval(sprintf("gset output 'fig%d.eps'",kk));
+	#__gnuplot_set__ terminal postscript eps 
+	#eval(sprintf("__gnuplot_set__ output 'fig%d.eps'",kk));
 	#replot
-	#gset terminal x11
+	#__gnuplot_set__ terminal x11
 	#prompt
       endfor
 
diff -r eecc24b92d97 -r 32c569794216 scripts/quaternion/qcoordinate_plot.m
--- a/scripts/quaternion/qcoordinate_plot.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/quaternion/qcoordinate_plot.m	Wed Mar 16 18:54:52 2005 +0000
@@ -110,7 +110,7 @@
   jbv = jnk(:,2);
   kbv = jnk(:,3);
 
-  gset size square
+  __gnuplot_set__ size square
   axis ([-2, 2, -2, 2]);
 
   [vv, theta] = quaternion (qb);
diff -r eecc24b92d97 -r 32c569794216 scripts/signal/freqz_plot.m
--- a/scripts/signal/freqz_plot.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/signal/freqz_plot.m	Wed Mar 16 18:54:52 2005 +0000
@@ -45,7 +45,7 @@
       automatic_replot = 0;
 
       subplot (311);
-      gset lmargin 10;
+      __gnuplot_set__ lmargin 10;
       axis ("labely");
       xlabel ("");
       grid ("on");
@@ -56,7 +56,7 @@
       axis ("labely");
       title ("");
       xlabel ("");
-      gset tmargin 0;
+      __gnuplot_set__ tmargin 0;
       grid ("on");
       if (maxmag - min (mag) > 100)
       	axis ([ w(1), w(n), maxmag-100, maxmag ]);
@@ -84,8 +84,8 @@
 
       grid ("off");
       axis ("auto", "label");
-      gset lmargin;
-      gset tmargin;
+      __gnuplot_set__ lmargin;
+      __gnuplot_set__ tmargin;
       oneplot ();
 
       automatic_replot = replot_state;
diff -r eecc24b92d97 -r 32c569794216 scripts/sparse/spy.m
--- a/scripts/sparse/spy.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/sparse/spy.m	Wed Mar 16 18:54:52 2005 +0000
@@ -31,9 +31,9 @@
   unwind_protect
     automatic_replot = 0;
 
-    eval(sprintf('gset nokey'))
-    eval(sprintf('gset yrange [0:%d] reverse',m+1))
-    eval(sprintf('gset xrange [0:%d] noreverse',n+1))
+    eval(sprintf('__gnuplot_set__ nokey'))
+    eval(sprintf('__gnuplot_set__ yrange [0:%d] reverse',m+1))
+    eval(sprintf('__gnuplot_set__ xrange [0:%d] noreverse',n+1))
 
     if (length(i)<1000)
       plot(j,i,'*');
@@ -42,7 +42,7 @@
     endif
 
     #TODO: we should store the reverse state so we don't undo it
-    gset yrange [0:1] noreverse
+    __gnuplot_set__ yrange [0:1] noreverse
     axis;
   unwind_protect_cleanup
     automatic_replot = arp;
diff -r eecc24b92d97 -r 32c569794216 scripts/statistics/base/ppplot.m
--- a/scripts/statistics/base/ppplot.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/statistics/base/ppplot.m	Wed Mar 16 18:54:52 2005 +0000
@@ -69,7 +69,7 @@
 
   if (nargout == 0)
     axis ([0, 1, 0, 1]);
-    gset nokey;
+    __gnuplot_set__ nokey;
     plot (p, y);
   endif
 
diff -r eecc24b92d97 -r 32c569794216 scripts/statistics/base/qqplot.m
--- a/scripts/statistics/base/qqplot.m	Wed Mar 16 17:14:12 2005 +0000
+++ b/scripts/statistics/base/qqplot.m	Wed Mar 16 18:54:52 2005 +0000
@@ -80,7 +80,7 @@
   if (nargout == 0)
     xlabel (q_label);
     ylabel ("sample points");
-    gset nokey;
+    __gnuplot_set__ nokey;
     plot (q, s);
   endif
 
diff -r eecc24b92d97 -r 32c569794216 src/ChangeLog
--- a/src/ChangeLog	Wed Mar 16 17:14:12 2005 +0000
+++ b/src/ChangeLog	Wed Mar 16 18:54:52 2005 +0000
@@ -1,3 +1,15 @@
+2005-03-16  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/gplot.l (Fset, Fshow): Delete.
+	(F__gnuplot_plot__): Rename from Fgplot.
+	(F__gnuplot_splot__): Rename from Fgsplot.
+	(F__gnuplot_raw__): Rename from Fgraw.
+	(F__gnuplot_set__): Rename from Fgset.
+	(F__gnuplot_show__): Rename from Fgshow.
+	(F__gnuplot_replot__): Rename from Freplot.
+	(WARN_DEPRECATED, DEPRECATED_BODY): New macros.
+	(Fgplot, Fgsplot, Fgraw, Fgset, Fgshow): New functions.
+
 2005-03-15  John W. Eaton  <jwe@octave.org>
 
 	* lex.l (<COMMAND_START>{NL}): Reset lexer_flags.doing_rawcommand
diff -r eecc24b92d97 -r 32c569794216 src/DLD-FUNCTIONS/gplot.l
--- a/src/DLD-FUNCTIONS/gplot.l	Wed Mar 16 17:14:12 2005 +0000
+++ b/src/DLD-FUNCTIONS/gplot.l	Wed Mar 16 18:54:52 2005 +0000
@@ -2,18 +2,26 @@
 %option noyywrap
 
 %{
+// PKG_ADD: mark_as_rawcommand ("__gnuplot_plot__");
+// PKG_ADD: mark_as_rawcommand ("__gnuplot_set__");
+// PKG_ADD: mark_as_rawcommand ("__gnuplot_splot__");
+// PKG_ADD: mark_as_rawcommand ("__gnuplot_replot__");
+
 // PKG_ADD: mark_as_rawcommand ("gplot");
 // PKG_ADD: mark_as_rawcommand ("gset");
 // PKG_ADD: mark_as_rawcommand ("gsplot");
-
 // PKG_ADD: mark_as_rawcommand ("replot");
 
+// PKG_ADD: mark_as_command ("__gnuplot_show__");
+
 // PKG_ADD: mark_as_command ("gshow");
+
 // PKG_ADD: mark_as_command ("hold");
+
 // PKG_ADD: mark_as_command ("set");
 // PKG_ADD: mark_as_command ("show");
 
-// PKG_ADD: __gplot_init__ ();
+// PKG_ADD: __gnuplot_init__ ();
 
 // PKG_ADD: atexit ("closeplot");
 
@@ -1118,27 +1126,6 @@
     }
 }
 
-DEFUN_DLD (gplot, args, ,
-  "Plot with gnuplot.\n")
-{
-  doplot ("plot", args);
-  return octave_value_list ();
-}
-
-DEFUN_DLD (gsplot, args, ,
-  "Plot with gnuplot.\n")
-{
-  doplot ("splot", args);
-  return octave_value_list ();
-}
-
-DEFUN_DLD (replot, args, ,
-  "Plot with gnuplot.\n")
-{
-  doplot ("replot", args);
-  return octave_value_list ();
-}
-
 DEFUN_DLD (clearplot, , ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} clearplot\n\
@@ -1146,11 +1133,6 @@
 Clear the plot window and any titles or axis labels.  The name\n\
 @code{clg} is aliased to @code{clearplot} for compatibility with\n\
 @sc{Matlab}.\n\
-\n\
-The commands @kbd{gplot clear}, @kbd{gsplot clear}, and @kbd{replot\n\
-clear} are equivalent to @code{clearplot}.  (Previously, commands like\n\
-@kbd{gplot clear} would evaluate @code{clear} as an ordinary expression\n\
-and clear all the visible variables.)\n\
 @end deftypefn")
 {
   octave_value_list retval;
@@ -1266,9 +1248,9 @@
   return retval;
 }
 
-DEFUN_DLD (graw, args, ,
+DEFUN_DLD (__gnuplot_raw__, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} graw (@var{string})\n\
+@deftypefn {Built-in Function} {} __gnuplot_raw__ (@var{string})\n\
 Send @var{string} directly to gnuplot subprocess.\n\
 @end deftypefn")
 {
@@ -1294,9 +1276,9 @@
   return retval;
 }
 
-DEFUN_DLD (gset, args, ,
+DEFUN_DLD (__gnuplot_set__, args, ,
   "-*- texinfo -*-\n\
-@deffn {Command} gset options\n\
+@deffn {Command} __gnuplot_set__ options\n\
 Set plotting options for gnuplot\n\
 @end deffn")
 {
@@ -1348,17 +1330,9 @@
   return retval;
 }
 
-DEFUN_DLD (set, args, nargout,
+DEFUN_DLD (__gnuplot_show__, args, ,
   "-*- texinfo -*-\n\
-This command is has been replaced by @code{gset}.")
-{
-  warning ("set is obsolete -- use gset instead");
-  return Fgset (args, nargout);
-}
-
-DEFUN_DLD (gshow, args, ,
-  "-*- texinfo -*-\n\
-@deffn {Command} gshow options\n\
+@deffn {Command} __gnuplot_show__ options\n\
 Show plotting options.\n\
 @end deffn")
 {
@@ -1388,12 +1362,82 @@
   return retval;
 }
 
-DEFUN_DLD (show, args, nargout,
-  "-*- texinfo -*-\n\
-This command is has been replaced by @code{gshow}.")
+DEFUN_DLD (__gnuplot_plot__, args, ,
+  "Plot with gnuplot.\n")
+{
+  doplot ("plot", args);
+  return octave_value_list ();
+}
+
+DEFUN_DLD (__gnuplot_splot__, args, ,
+  "Plot with gnuplot.\n")
+{
+  doplot ("splot", args);
+  return octave_value_list ();
+}
+
+DEFUN_DLD (__gnuplot_replot__, args, ,
+  "Plot with gnuplot.\n")
 {
-  warning ("show is obsolete -- use gshow instead");
-  return Fgshow (args, nargout);
+  doplot ("replot", args);
+  return octave_value_list ();
+}
+
+// Deprecated functions.
+
+#define WARN_DEPRECATED(FOLD, FNEW) \
+  do \
+    { \
+      static bool warned = false; \
+      if (! warned) \
+	{ \
+	  warned = true; \
+	  warning (#FOLD " is deprecated and will be removed from a future"); \
+	  warning ("version of Octave."); \
+	  warning ("You should use the higher-level plot functions"); \
+	  warning ("(\"plot\", \"mesh\", \"semilogx\", etc.) instead"); \
+	  warning ("of the low-level plotting commands."); \
+	  warning ("If you absolutely must use this function, use the"); \
+	  warning ("internal version " #FNEW " instead."); \
+	} \
+    } \
+  while (0)
+    
+#define DEPRECATED_BODY(FOLD, FNEW) \
+  WARN_DEPRECATED (FOLD, FNEW); \
+  return feval (#FNEW, args)
+
+// We can't further simplify this by putting the DEFUN_DLD in a macro
+// because then the mk-oct-links script will fail.
+
+DEFUN_DLD (gplot, args, ,
+  "")
+{
+  DEPRECATED_BODY (gplot, __gnuplot_plot__);
+}
+
+DEFUN_DLD (gsplot, args, ,
+  "")
+{
+  DEPRECATED_BODY (gsplot, __gnuplot_splot__);
+}
+
+DEFUN_DLD (graw, args, ,
+  "")
+{
+  DEPRECATED_BODY (graw, __gnuplot__raw__);
+}
+
+DEFUN_DLD (gset, args, ,
+  "")
+{
+  DEPRECATED_BODY (gset, __gnuplot_set__);
+}
+
+DEFUN_DLD (gshow, args, ,
+  "")
+{
+  DEPRECATED_BODY (gshow, __gnuplot__show__);
 }
 
 static int
@@ -1484,19 +1528,19 @@
   return 0;
 }
 
-DEFUN_DLD (__gplot_init__, , ,
+DEFUN_DLD (__gnuplot_init__, , ,
   "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} __gplot_init__ ()\n\
+@deftypefn {Loadable Function} __gnuplot_init__ ()\n\
 @end deftypefn")
 {
   octave_value_list retval;
 
-  static bool gplot_initialized = false;
+  static bool gnuplot_initialized = false;
 
-  if (gplot_initialized)
+  if (gnuplot_initialized)
     return retval;
 
-  gplot_initialized = true;
+  gnuplot_initialized = true;
 
   DEFVAR (automatic_replot, true, automatic_replot,
     "-*- texinfo -*-\n\