diff --git a/‎ChangeLog‎
Lines changed: 16 additions & 0 deletions b/‎ChangeLog‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎NEWS‎
Lines changed: 2 additions & 0 deletions b/‎NEWS‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎docs/figure_missing.pdf‎
15 KB b/‎docs/figure_missing.pdf‎
15 KB
diff --git a/‎docs/gnuplot.doc‎
Lines changed: 44 additions & 34 deletions b/‎docs/gnuplot.doc‎
Lines changed: 44 additions & 34 deletions
diff --git a/‎src/datafile.c‎
Lines changed: 9 additions & 1 deletion b/‎src/datafile.c‎
Lines changed: 9 additions & 1 deletion
@@ -1,3 +1,19 @@
+2012-05-02  Ethan A Merritt  <merritt@u.washington.edu>
+
+	* src/datafile.c (df_readascii):  CHANGE long-standing program action to
+	check every input data line individually for number of data columns.
+	Instead, whatever number of columns are found in the first record, that
+	same number is expected for the rest of the input file.
+	This is not ideal, because plot 'foo' with points will now fail if 'foo'
+	has 4 or more entries on the first line but only 3 on subsequent lines.
+	On the other hand, it fixes the unexpected behavior that
+	    3 NaN
+	in record 5, for example, would be treated as (5,3) DEFINED
+	rather than as (3,NaN) UNDEFINED.
+
+	* docs/gnuplot.doc docs/figure_missing.pdf:  Documentation and example
+	for above change.
+
 2012-04-30  Ethan A Merritt  <merritt@u.washington.edu>
 
 	* src/term.c (do_arc):  A bug in the new wedge/nowedge option left a
 
@@ -9,6 +9,8 @@ New features, changes and fixes since gnuplot version 4.6
 * CHANGE 'set [xyz]axis ... reverse' affects only auto-scaling
 * CHANGE Revised handling of NaN in input data stream
 * CHANGE Remove the BACKWARDS_COMPATIBLE build option (deprecated since v4.0)
+* CHANGE The number of valid columns in the first line of a data line
+         is used to decide the interpretation of all lines in the file.
 
 
 New features, changes and fixes in gnuplot version 4.6
 
@@ -1,4 +1,4 @@
-C RCS $Id: gnuplot.doc,v 1.729 2012/04/20 19:36:02 sfeam Exp $
+C RCS $Id: gnuplot.doc,v 1.730 2012/04/23 19:25:15 sfeam Exp $
 C
 C Copyright (C) 1986 - 1993, 1998, 1999, 2000, 2001, 2004   Thomas Williams, Colin Kelley et al.
 C
@@ -203,9 +203,14 @@ C
 
 2 New features
 ?new-features
- This section lists major additions since version 4.6.
+ This section lists major additions and changes since version 4.6.
  For a more exhaustive list, see the NEWS file.
-3 NOTHING HERE YET
+
+ * New coordinate system (Degrees, Minutes, Seconds). See `set xdata geographic`.
+
+ * New support for 32-bit Alpha channel + RGB colors #AARRGGBB.  See `colorspec`.
+
+ * Changed handling of NaN or other unexpected input data.  See `missing`.
 
 2 Deprecated syntax
 ?deprecated syntax
@@ -2107,8 +2112,6 @@ Ffigure_newsyntax
 ?tc
 ?textcolor
  Many commands allow you to specify a linetype with an explicit color.
- Terminal-independent color choice is only possible for terminals that support
- RGB color or pm3d palettes.
 
  Syntax:
 
@@ -2119,6 +2122,7 @@ Ffigure_newsyntax
 
        rgbcolor "colorname"
        rgbcolor "#RRGGBB"
+       rgbcolor "#AARRGGBB"
        rgbcolor variable       # color is read from input file
        palette frac <val>      # <val> runs from 0 to 1
        palette cb <value>      # <val> lies within cbrange
@@ -2136,6 +2140,13 @@ Ffigure_newsyntax
  be represented by #FF00FF, which is the hexadecimal representation of
  (255 << 16) + (0 << 8) + (255).
 
+ "#AARRGGBB" represents an RGB color with an alpha channel (transparency) 
+ value in the high bits. An alpha value of 0 represents a fully opaque color;
+ i.e., "#00RRGGBB" is the same as "#RRGGBB".  An alpha value of 255 (FF)
+ represents full transparency. `Note`: This convention for the alpha channel
+ is backwards from that used by the "with rgbalpha" image plot mode in earlier
+ versions of gnuplot.
+
  The color palette is a linear gradient of colors that smoothly maps a
  single numerical value onto a particular color.  Two such mappings are always
  in effect. `palette frac`  maps a fractional value between 0 and 1 onto the
@@ -7469,17 +7480,22 @@ Ffigure_mapcontours
 ?show datafile missing
 ?set missing
 ?missing
- The `set datafile missing` command allows you to tell `gnuplot` what character
- string is used in a data file to denote missing data.  Exactly how this missing
- value will be treated depends on the `using` specifier of the `plot` or `splot`
- command.
+ The `set datafile missing` command tells `gnuplot` there is a special string
+ used in input data files to denote a missing data entry.  There is no default
+ character for `missing`, but in many cases any non-parsible string of
+ characters found where a numerical value is expected will cause the line to be
+ treated as missing data. There is a distinction between missing data and 
+ invalid data (e.g. "NaN", 1/0.).  Invalid data causes a gap in the line drawn
+ through the points; missing data does not.
+
  Syntax:
-       set datafile missing {"<string>"}
+       set datafile missing "<string>"
        show datafile missing
        unset datafile
- Example:
-       # Ignore entries containing IEEE NaN ("Not a Number") code
-       set datafile missing "NaN"
+
+ `Note`: The treatment of certain cases has changed in this version of gnuplot.
+ The example below shows the difference.
+Ffigure_missing
  Example:
        set style data linespoints
        plot '-' title "(a)"
@@ -7500,32 +7516,28 @@ Ffigure_mapcontours
        plot '-' using 1:2 title "(c)"
           1 10
           2 20
-          3 ?
+          3 NaN
           4 40
           5 50
           e
        plot '-' using 1:($2) title "(d)"
           1 10
           2 20
-          3 ?
+          3 NaN
           4 40
           5 50
           e
 
- The first `plot` will recognize only the first datum in the "3 ?" line.  It
- will use the single-datum-on-a-line convention that the line number is "x"
- and the datum is "y", so the point will be plotted (in this case erroneously)
- at (2,3).
-
- The second and third `plot` commands will correctly ignore the middle line.
- The plotted line will connect the points at (2,20) and (4,40).
+ Plot (a) differs because the third line contains only one valid number.
+ Old gnuplot versions switched to a single-datum-on-a-line convention that the
+ line number is "x" and the datum is "y", erroneously placing the point at(2,3).
 
- The fourth `plot` will also correctly ignore the middle line, but the plotted
- line will not connect the points at (2,20) and (4,40).
+ Both the old and new gnuplot versions handle the same data correctly if the
+ '?' character is designated as a marker for missing data (b).
 
- There is no default character for `missing`, but in many cases any
- non-parsible string of characters found where a numerical value is expected
- will be treated as missing data.
+ Old gnuplot versions handled NaN differently depending of the form of the
+ `using` clause, as shown in plots (c) and (d).  Gnuplot now handles NaN the
+ same whether the input column was specified as N or ($N).
 
 4 set datafile separator
 ?set datafile separator
@@ -7550,23 +7562,21 @@ Ffigure_mapcontours
 4 set datafile commentschars
 ?set datafile commentschars
 ?commentschars
- The `set datafile commentschars` command allows you to tell `gnuplot` what
- characters are used in a data file to denote comments.  Gnuplot will ignore
- rest of the line behind the specified characters if either of them is the
- first non-blank character on the line.
+ The `set datafile commentschars` tells `gnuplot` what characters are used in a
+ data file to begin comment lines. If the first non-blank character on a line is
+ one of the specified characters then the rest of the input line is ignored.
+ Default value of the string is "#!" on VMS and "#" otherwise.
 
  Syntax:
        set datafile commentschars {"<string>"}
        show datafile commentschars
        unset commentschars
 
- Default value of the string is "#!" on VMS and "#" otherwise.
-
  Then, the following line in a data file is completely ignored
      # 1 2 3 4
  but the following
      1 # 3 4
- produces rather unexpected plot unless
+ produces a rather unexpected plot unless
      set datafile missing '#'
  is specified as well.
 
 
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid() { return RCSid("$Id: datafile.c,v 1.218 2012/04/17 22:42:52 sfeam Exp $"); }
+static char *RCSid() { return RCSid("$Id: datafile.c,v 1.219 2012/05/02 04:21:58 sfeam Exp $"); }
 #endif
 
 /* GNUPLOT - datafile.c */
@@ -1954,6 +1954,14 @@ df_readascii(double v[], int max)
 	       || output == df_no_use_specs
 	       || output == max);
 
+	/*
+	 * EAM Apr 2012 - If there is no using spec, then whatever we found on
+	 * the first line becomes the expectation for the rest of the input file.
+	 * THIS IS A CHANGE!
+	 */
+	 if (df_no_use_specs == 0)
+		df_no_use_specs = output;
+
 	return output;
 
     }