--- a/scripts/ChangeLog	Thu Sep 07 04:59:04 2000 +0000
+++ b/scripts/ChangeLog	Fri Sep 08 06:27:45 2000 +0000
@@ -1,3 +1,11 @@
+2000-09-08  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+2000-09-08  Teemu Ikonen  <tpikonen@pcu.helsinki.fi>
+
+	* plot/mesh.m: Also set nologscale before plotting.
+	* plot/__pltopt1__.m: Handle xerrorbars, yerrorbars, and
+	xyerrorbars instead of just errorbars.
+
 2000-08-25  Thomas Walter  <walter@pctc.chemie.uni-erlangen.de>
 
 	* image/image.m: Try display (from ImageMagick) first.

--- a/scripts/plot/__pltopt1__.m	Thu Sep 07 04:59:04 2000 +0000
+++ b/scripts/plot/__pltopt1__.m	Fri Sep 08 06:27:45 2000 +0000
@@ -37,7 +37,8 @@
   set_impulses = 0;
   set_steps = 0;
   set_boxes = 0;
-  set_errbars = 0;
+  set_yerrbars = 0;
+  set_xerrbars = 0;
   set_key = 0;
   set_linestyle = "solid";
 
@@ -52,7 +53,9 @@
   DOTS = "d";
   IMPULSES = "i";
   STEPS = "s";
-  ERRORBARS = "e";
+  YERRORBARS = "yerr";
+  XERRORBARS = "xerr";
+  XYERRORBARS = "xyerr";
   TITLE = "title";
 
   if (nargin != 2)
@@ -100,7 +103,9 @@
     elseif (strcmp (char, "L"))
       set_steps = 1;
     elseif (strcmp (char, "~"))
-      set_errbars = 1;
+      set_yerrbars = 1;
+    elseif (strcmp (char, ">"))
+      set_xerrbars = 1;  
     elseif (strcmp (char, "#"))
       set_boxes = 1;
     elseif (strcmp (char, "0") || strcmp (char, "1") ...
@@ -194,7 +199,7 @@
       fmt = strcat (fmt, " ", LINES);
     endif
   elseif (set_boxes)
-    if (set_errbars)
+    if (set_yerrbars)
       fmt = strcat (fmt, " ", BOXERRORBARS);
     else
       fmt = strcat (fmt, " ", BOXES);
@@ -207,8 +212,14 @@
     fmt = strcat (fmt, " ", IMPULSES);
   elseif (set_steps)
     fmt = strcat (fmt, " ", STEPS);
-  elseif (set_errbars)
-    fmt = strcat (fmt, " ", ERRORBARS);
+  elseif (set_yerrbars)
+    if(set_xerrbars)
+        fmt = strcat (fmt, " ", XYERRORBARS);
+    else
+        fmt = strcat (fmt, " ", YERRORBARS);
+    endif
+  elseif (set_xerrbars)
+    fmt = strcat (fmt, " ", XERRORBARS);
   endif
 
   if (strcmp (fmt, WITH))

--- a/scripts/plot/__pltopt__.m	Thu Sep 07 04:59:04 2000 +0000
+++ b/scripts/plot/__pltopt__.m	Fri Sep 08 06:27:45 2000 +0000
@@ -30,37 +30,59 @@
 ## @table @code
 ## @item "-"
 ## For lines plot style (default).
+##
 ## @item "."
 ## For dots plot style.
+##
 ## @item "@"
 ## For points plot style.
+##
 ## @item "-@"
-##For linespoints plot style.
+## For linespoints plot style.
+##
 ## @item "^"
 ## For impulses plot style.
+##
 ## @item "L"
 ## For steps plot style.
+##
 ## @item "#"
 ## For boxes plot style.
+##
 ## @item "~"
-## For errorbars plot style.
+## For yerrorbars plot style.
+##
+## @item ">"
+## For xerrorbars plot style.
+##
+## @item "~>"
+## For xyerrorbars plot style.
+##
 ## @item "#~"
 ## For boxerrorbars plot style.
+##
 ## @item "n"
 ## With @code{n} in 1-6 (wraps at 8), plot color
+##
 ## @item "nm"
 ## With @code{m} in 1-6 (wraps at 6), point style (only valid for @code{"@"} or
 ## @code{"-@"})
+##
 ## @item @var{c}
 ## Where @var{c} is one of @code{"r"}, @code{"g"}, @code{"b"}, @code{"m"},
 ## @code{"c"}, or @code{"w"} colors.
+##
 ## @item ";title;"
 ## Here @code{"title"} is the label for the key.
+##
+## @item +
+## @itemx *
+## @itemx o
+## @itemx x
+## Used in combination with the points or linespoints styles, set the point
+## style.
 ## @end table
 ##
-## Special points formats:  @code{"+"}, @code{"*"}, @code{"o"}, or
-## @code{"x"} will display points in that style for term x11.
-##
 ## The legend may be fixed to include the name of the variable
 ## plotted in some future version of Octave.
 ##

--- a/scripts/plot/mesh.m	Thu Sep 07 04:59:04 2000 +0000
+++ b/scripts/plot/mesh.m	Fri Sep 08 06:27:45 2000 +0000
@@ -45,6 +45,7 @@
       gset surface;
       gset nocontour;
       gset noparametric;
+      gset nologscale;
       gset view 60, 30, 1, 1
       gsplot (z');
     else
@@ -71,6 +72,7 @@
         gset data style lines;
         gset surface;
         gset nocontour;
+        gset nologscale;
         gset parametric;
         gset view 60, 30, 1, 1
         gsplot (zz);
@@ -98,6 +100,7 @@
         gset data style lines;
         gset surface;
         gset nocontour;
+        gset nologscale;
         gset parametric;
         gset view 60, 30, 1, 1
         gsplot (zz);

--- a/scripts/plot/plot.m	Thu Sep 07 04:59:04 2000 +0000
+++ b/scripts/plot/plot.m	Fri Sep 08 06:27:45 2000 +0000
@@ -94,14 +94,20 @@
 ## @item L
 ## Set steps plot style.
 ##
-## @item #
-## Set boxes plot style.
+## @item "#"
+## For boxes plot style.
+##
+## @item "~"
+## For yerrorbars plot style.
 ##
-## @item ~
-## Set errorbars plot style.
+## @item ">"
+## For xerrorbars plot style.
 ##
-## @item #~
-## Set boxerrorbars plot style.
+## @item "~>"
+## For xyerrorbars plot style.
+##
+## @item "#~"
+## For boxerrorbars plot style.
 ##
 ## @item @var{n}
 ## Interpreted as the plot color if @var{n} is an integer in the range 1 to
@@ -117,6 +123,9 @@
 ## @code{"c"}, or @code{"w"}, it is interpreted as the plot color (red,
 ## green, blue, magenta, cyan, or white).
 ##
+## @item ";title;"
+## Here @code{"title"} is the label for the key.
+##
 ## @item +
 ## @itemx *
 ## @itemx o
@@ -170,7 +179,7 @@
 ## in the key.
 ## @end deftypefn
 ## @seealso{semilogx, semilogy, loglog, polar, mesh, contour, __pltopt__
-## bar, stairs, gplot, gsplot, replot, xlabel, ylabel, and title}
+## bar, stairs, errorbar, gplot, gsplot, replot, xlabel, ylabel, and title}
 
 ## Author: jwe