changeset 4498:093e39f03506

[project @ 2003-09-05 16:55:42 by jwe]
author jwe
date Fri, 05 Sep 2003 16:55:43 +0000
parents 2a02f3a16fe0
children 55695bf73797
files liboctave/lo-cieee.c liboctave/lo-ieee.h src/ChangeLog src/pt-plot.cc
diffstat 4 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/lo-cieee.c	Thu Sep 04 18:48:13 2003 +0000
+++ b/liboctave/lo-cieee.c	Fri Sep 05 16:55:43 2003 +0000
@@ -129,8 +129,8 @@
 int
 lo_ieee_is_NaN_or_NA (double x)
 {
-  // Although NA really is an IEEE NaN value, lo_ieee_isnan pretends
-  // it is not, so we much check both...
+  /* Although NA really is an IEEE NaN value, lo_ieee_isnan pretends
+     it is not, so we much check both...  */
 
   return lo_ieee_isnan (x) || lo_ieee_is_NA (x);
 }
--- a/liboctave/lo-ieee.h	Thu Sep 04 18:48:13 2003 +0000
+++ b/liboctave/lo-ieee.h	Fri Sep 05 16:55:43 2003 +0000
@@ -66,9 +66,9 @@
 extern double lo_ieee_na_value (void);
 extern double lo_ieee_nan_value (void);
 
-// In the following definitions, only check x < 0 explicitly to avoid
-// a function call when it looks like signbit or copysign are actually
-// functions.
+/* In the following definitions, only check x < 0 explicitly to avoid
+   a function call when it looks like signbit or copysign are actually
+   functions.  */
 
 #if defined (signbit)
 #define lo_ieee_signbit(x) signbit (x)
--- a/src/ChangeLog	Thu Sep 04 18:48:13 2003 +0000
+++ b/src/ChangeLog	Fri Sep 05 16:55:43 2003 +0000
@@ -1,3 +1,8 @@
+2003-09-04  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* pt-plot.cc (subplot_style::columns_ok): Allow boxes style to
+	have 2 columns as well.
+
 2003-08-28  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* dirfns.cc (Fls): Check EAGAIN to avoid losing output.
--- a/src/pt-plot.cc	Thu Sep 04 18:48:13 2003 +0000
+++ b/src/pt-plot.cc	Fri Sep 05 16:55:43 2003 +0000
@@ -592,7 +592,8 @@
 {
   bool retval = true;
 
-  if ((almost_match ("boxes", sp_style, 5, 0) && nc != 3)
+  if ((almost_match ("boxes", sp_style, 5, 0)
+       && (! (nc == 2 || nc == 3)))
       || (almost_match ("boxerrorbars", sp_style, 5, 0)
 	  && (! (nc == 3 || nc == 4 || nc == 5)))
       || ((almost_match ("boxxyerrorbars", sp_style, 4, 0)