test

Changes

@@ -1,29 +1,3 @@
-feedgnuplot (1.30) unstable; urgency=low
-
-  * Added --with, --set, --unset, --style, --styleall
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 24 Jan 2014 15:38:07 -0800
-
-feedgnuplot (1.29) unstable; urgency=low
-
-  * added CPAN meta-data to require IPC::Run at build time
-
- -- Dima Kogan <dima@secretsauce.net>  Wed, 04 Dec 2013 21:12:40 -0800
-
-feedgnuplot (1.28)
-
-  * Minor POD update
-
- -- Dima Kogan <dima@secretsauce.net>  Wed, 04 Dec 2013 02:01:05 -0800
-
-feedgnuplot (1.27)
-
-  * Disabled tests that can fail on some arches (can be re-enabled with
-    environment variable)
-  * Removed sample debianization; this program is now in Debian proper
-
- -- Dima Kogan <dima@secretsauce.net>  Tue, 03 Dec 2013 23:37:40 -0800
-
 feedgnuplot (1.26)
 
   * Minor POD fixes

INSTALL

@@ -1,9 +1,17 @@
 If running on a Debian-based OS (this includes Ubuntu), it is highly recommended
-to install this program as a package. In Debian and Ubuntu, feedgnuplot is in
+to install this program as a package. In debian/unstable feedgnuplot is in the
-the official repos, so all you need to do is
+official repos, so all you need to do is
 
    sudo apt-get install feedgnuplot
 
+Otherwise a package can be built with
+
+   ln -fs package_definitions/debian debian
+   dpkg-buildpackage -us -uc -b
+   sudo dpkg -i ../feedgnuplot*.deb
+
+This builds a debian package and installs it.
+
 Without a package, an installation can be done with
 
          perl Makefile.PL prefix=/usr/local

Makefile.PL

@@ -63,8 +63,7 @@ WriteMakefile
     : ()),
    PL_FILES                   => {},
    EXE_FILES                  => [ 'bin/feedgnuplot' ],
-   BUILD_REQUIRES             => { 'String::ShellQuote' => 0,
+   BUILD_REQUIRES             => { 'String::ShellQuote' => 0},
-                                   'IPC::Run'           => 0},
    dist                       => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
    clean                      => { FILES => 'feedgnuplot-*' },
   );

README.pod

@@ -1 +0,0 @@
-bin/feedgnuplot

bin/feedgnuplot

@@ -13,7 +13,7 @@ use Thread::Queue;
 use Pod::Usage;
 use Time::Piece;
 
-my $VERSION = 1.30;
+my $VERSION = 1.26;
 
 my %options;
 interpretCommandline();
@@ -107,25 +107,14 @@ sub interpretCommandline
   # syntax, but disregarded the order of the given options. This resulted in arbitrarily ordered
   # curves. I thus make parse these into lists, and then also make hashes, for later use
 
-  # needed for these to be parsed into an array-ref, these default to []
+  # needed for these to be parsed into an array-ref
   $options{legend}     = [];
   $options{curvestyle} = [];
-  $options{style}      = [];
   $options{histogram}  = [];
-  $options{y2}         = [];
-  $options{extracmds}  = [];
-  $options{set}        = [];
-  $options{unset}      = [];
-
-  $options{curvestyleall} = '';
-  $options{styleall}      = '';
-  $options{with}          = '';
-
   GetOptions(\%options, 'stream:s', 'domain!', 'dataid!', '3d!', 'colormap!', 'lines!', 'points!',
              'circles', 'legend=s{2}', 'autolegend!', 'xlabel=s', 'ylabel=s', 'y2label=s', 'zlabel=s',
              'title=s', 'xlen=f', 'ymin=f', 'ymax=f', 'xmin=s', 'xmax=s', 'y2min=f', 'y2max=f',
-             'zmin=f', 'zmax=f', 'y2=s@',
+             'zmin=f', 'zmax=f', 'y2=s@', 'curvestyle=s{2}', 'curvestyleall=s', 'extracmds=s@',
-             'style=s{2}', 'curvestyle=s{2}', 'curvestyleall=s', 'styleall=s', 'with=s', 'extracmds=s@', 'set=s@', 'unset=s@',
              'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s',
              'histogram=s@', 'binwidth=f', 'histstyle=s',
              'terminal=s',
@@ -149,6 +138,9 @@ sub interpretCommandline
     exit 0;
   }
 
+  # no global style if one isn't given
+  $options{curvestyleall} = '' unless defined $options{curvestyleall};
+
   # expand options that are given as comma-separated lists
   for my $listkey (qw(histogram y2))
   {
@@ -156,22 +148,6 @@ sub interpretCommandline
       if defined $options{$listkey};
   }
 
-  # --style and --curvestyle are synonyms, as are --styleall and
-  # --curvestyleall, so fill that in
-  if( $options{styleall} )
-  {
-    if($options{curvestyleall} )
-    {
-      $options{curvestyleall} .= " $options{styleall}";
-    }
-    else
-    {
-      $options{curvestyleall} = $options{styleall};
-    }
-  }
-  push @{$options{curvestyle}}, @{$options{style}};
-
-
   # --legend and --curvestyle options are conceptually hashes, but are parsed as
   # arrays in order to preserve the ordering. I parse both of these into hashes
   # because those are useful to have later. After this I can access individual
@@ -227,17 +203,6 @@ sub interpretCommandline
     }
   }
 
-  if( $options{curvestyleall} && $options{with} )
-  {
-    print STDERR "--curvestyleall and --with are mutually exclusive. Please just use one.\n";
-    exit -1;
-  }
-  if( $options{with} )
-  {
-    $options{curvestyleall} = "with $options{with}";
-    $options{with} = '';
-  }
-
   if ($options{colormap})
   {
     # colormap styles all curves with palette. Seems like there should be a way to do this with a
@@ -259,7 +224,7 @@ sub interpretCommandline
       exit -1;
     }
 
-    if ( defined $options{y2min} || defined $options{y2max} || @{$options{y2}} )
+    if ( defined $options{y2min} || defined $options{y2max} || defined $options{y2} )
     {
       print STDERR "--3d does not make sense with --y2...\n";
       exit -1;
@@ -521,7 +486,7 @@ sub mainThread
     }
 
 # For the specified values, set the legend entries to 'title "blah blah"'
-    if(@{$options{legend}})
+    if(defined $options{legend} && @{$options{legend}})
     {
       # @{$options{legend}} is a list where consecutive pairs are (curveID,
       # legend). I use $options{legend} here instead of $options{legend_hash}
@@ -536,7 +501,7 @@ sub mainThread
     }
 
 # add the extra curve options
-    if(@{$options{curvestyle}})
+    if(defined $options{curvestyle} && @{$options{curvestyle}})
     {
       # @{$options{curvestyle}} is a list where consecutive pairs are (curveID,
       # style). I use $options{curvestyle} here instead of
@@ -551,7 +516,13 @@ sub mainThread
     }
 
 # For the values requested to be printed on the y2 axis, set that
-    addCurveOption($_, 'axes x1y2') foreach (@{$options{y2}});
+    if( defined $options{y2} )
+    {
+      foreach (@{$options{y2}})
+      {
+        addCurveOption($_, 'axes x1y2');
+      }
+    }
 
 # timefmt
     if( $options{timefmt} )
@@ -561,17 +532,26 @@ sub mainThread
     }
 
 # add the extra global options
-    print(PIPE "$_\n")       foreach (@{$options{extracmds}});
+    if(defined $options{extracmds})
-    print(PIPE "set $_\n")   foreach (@{$options{set}});
+    {
-    print(PIPE "unset $_\n") foreach (@{$options{unset}});
+      foreach (@{$options{extracmds}})
+      {
+        print(PIPE "$_\n");
+      }
+    }
 
 # set up histograms
-    $options{binwidth} ||= 1;   # if no binwidth given, set it to 1
+    if( defined $options{histogram} )
-    print PIPE
+    {
-      "set boxwidth $options{binwidth}\n" .
+      $options{binwidth} ||= 1; # if no binwidth given, set it to 1
-      "histbin(x) = $options{binwidth} * floor(0.5 + x/$options{binwidth})\n";
+      print PIPE
-
+        "set boxwidth $options{binwidth}\n" .
-    setCurveAsHistogram( $_ ) foreach (@{$options{histogram}});
+        "histbin(x) = $options{binwidth} * floor(0.5 + x/$options{binwidth})\n";
+      foreach (@{$options{histogram}})
+      {
+        setCurveAsHistogram( $_ );
+      }
+    }
 
     # regexp for a possibly floating point, possibly scientific notation number
     my $numRE   = '-?\d*\.?\d+(?:[Ee][-+]?\d+)?';
@@ -588,7 +568,7 @@ sub mainThread
     # gnuplot
     print PIPE "set xtics\n";
 
-    if(@{$options{y2}})
+    if($options{y2})
     {
       print PIPE "set ytics nomirror\n";
       print PIPE "set y2tics\n";
@@ -807,17 +787,9 @@ sub updateCurveOptions
 
   my $titleoption = defined $title ? "title \"$title\"" : "notitle";
 
-  my ($curvestyleall);
+  my $curvestyleall = '';
-  if( defined $options{curvestyle_hash}{$id} )
+  $curvestyleall = $options{curvestyleall}
-  {
+    if defined $options{curvestyleall} && !defined $options{curvestyle_hash}{$id};
-    # I have a curve-specific style set with --curvestyle. This style lives in
-    # $curve->{extraoptions}, and it overrides the global styles
-    $curvestyleall = '';
-  }
-  else
-  {
-    $curvestyleall = $options{curvestyleall};
-  }
 
   my $histoptions = $curve->{histoptions} || '';
 
@@ -989,47 +961,6 @@ Simple plotting of piped data:
 
  $ seq 5 | awk '{print 2*$1, $1*$1}' |
    feedgnuplot --lines --points --legend 0 "data 0" --title "Test plot" --y2 1
-               --terminal 'dumb 80,40' --exit
-
-                                  Test plot
-
-  10 ++------+--------+-------+-------+-------+--------+-------+------*A 25
-     +       +        +       +       +       +        +       +    **#+
-     |       :        :       :       :       :        : data 0+**A*** |
-     |       :        :       :       :       :        :       :** #   |
-   9 ++.......................................................**.##....|
-     |       :        :       :       :       :        :    ** :#      |
-     |       :        :       :       :       :        :  **   #       |
-     |       :        :       :       :       :        :**   ##:      ++ 20
-   8 ++................................................A....#..........|
-     |       :        :       :       :       :      **:   #   :       |
-     |       :        :       :       :       :    **  : ##    :       |
-     |       :        :       :       :       :  **    :#      :       |
-     |       :        :       :       :       :**      B       :       |
-   7 ++......................................**......##................|
-     |       :        :       :       :    ** :    ##  :       :      ++ 15
-     |       :        :       :       :  **   :   #    :       :       |
-     |       :        :       :       :**     : ##     :       :       |
-   6 ++..............................*A.......##.......................|
-     |       :        :       :    ** :     ##:        :       :       |
-     |       :        :       :  **   :    #  :        :       :       |
-     |       :        :       :**     :  ##   :        :       :      ++ 10
-   5 ++......................**........##..............................|
-     |       :        :    ** :      #B       :        :       :       |
-     |       :        :  **   :    ## :       :        :       :       |
-     |       :        :**     :  ##   :       :        :       :       |
-   4 ++...............A.......###......................................|
-     |       :      **:     ##:       :       :        :       :       |
-     |       :    **  :   ##  :       :       :        :       :      ++ 5
-     |       :  **    : ##    :       :       :        :       :       |
-     |       :**    ##B#      :       :       :        :       :       |
-   3 ++.....**..####...................................................|
-     |    **####      :       :       :       :        :       :       |
-     |  **## :        :       :       :       :        :       :       |
-     B**     +        +       +       +       +        +       +       +
-   2 A+------+--------+-------+-------+-------+--------+-------+------++ 0
-     1      1.5       2      2.5      3      3.5       4      4.5      5
-
 
 Simple real-time plotting example: plot how much data is received on the wlan0
 network interface in bytes/second (uses bash, awk and Linux):
@@ -1055,21 +986,14 @@ plotting. Input parsing is flexible; every line need not have the same number of
 points. New curves will be created as needed.
 
 The most commonly used functionality of gnuplot is supported directly by the
-script. Anything not directly supported can still be done with options such as
+script. Anything not directly supported can still be done with the
-C<--set>, C<--extracmds> C<--style>, etc. Arbitrary gnuplot commands can be
+C<--extracmds> and C<--curvestyle> options. Arbitrary gnuplot commands can be
-passed in with C<--extracmds>. For example, to turn off the grid, you can pass
+passed in with C<--extracmds>. For example, to turn off the grid, pass in
-in C<--extracmds 'unset grid'>. Commands C<--set> and C<--unset> exists to
+C<--extracmds 'unset grid'>. As many of these options as needed can be passed
-provide nicer syntax, so this is equivalent to passing C<--unset grid>. As many
+in. To add arbitrary curve styles, use C<--curvestyle curveID extrastyle>. Pass
-of these options as needed can be passed in. To add arbitrary curve styles, use
+these more than once to affect more than one curve. To apply an extra style to
-C<--style curveID extrastyle>. Pass these more than once to affect more than one
+I<all> the curves that lack an explicit C<--curvestyle>, pass in
-curve.
+C<--curvestyleall extrastyle>.
-
-To apply an extra style to I<all> the curves that lack an explicit C<--style>,
-pass in C<--styleall extrastyle>. In the most common case, the extra style is
-C<with something>. To support this more simply, you can pass in C<--with
-something> instead of C<--styleall 'with something'>. C<--styleall> and
-C<--with> are mutually exclusive. Furthermore any curve-specific C<--style>
-overrides the global C<--styleall> or C<--with> setting.
 
 =head2 Data formats
 
@@ -1085,7 +1009,7 @@ interpreted as the I<X>-value for the rest of the data on that line. Without
 C<--domain> the I<X>-value is the line number, and the first value on a line is
 a plain data point like the others. Default is C<--nodomain>. Thus the original
 example above produces 2 curves, with B<1,2,3,4,5> as the I<X>-values. If we run
-the same command with C<--domain>:
+the same command with --domain:
 
  $ seq 5 | awk '{print 2*$1, $1*$1}' | feedgnuplot --domain
 
@@ -1116,13 +1040,14 @@ to represent a single point. For example, the script has support to plot all the
 data with C<--circles>. This requires a radius to be specified for each point in
 addition to the position of the point. Thus, when plotting with C<--circles>, 2
 numbers are read for each data point instead of 1. A similar situation exists
-with C<--colormap> where each point contains the position I<and> the color.
+with C<--colormap> where each point contains the position I<and> the
-There are other gnuplot styles that require more data (such as error bars), but
+color. There are other gnuplot styles that require more data (such as error
-none of these are directly supported by the script. They can still be used,
+bars), but none of these are directly supported by the script. They can still be
-though, by specifying the specific style with C<--style>, and specifying how
+used, though, by specifying the specific style with C<--curvestyle>, and
-many extra values are needed for each point with C<--extraValuesPerPoint extra>.
+specifying how many extra values are needed for each point with
-C<--extraValuesPerPoint> is ONLY needed for the styles not explicitly supported;
+C<--extraValuesPerPoint extra>. C<--extraValuesPerPoint> is ONLY needed for the
-supported styles set that variable automatically.
+styles not explicitly supported; supported styles set that variable
+automatically.
 
 =head3 3D data
 
@@ -1165,7 +1090,7 @@ C<--timefmt>. Example:
    awk '$1 ~ /..:..:../ && $8 ~/^[0-9\.]*$/ {print $1,$8; fflush()}' |
    feedgnuplot --stream --domain
                 --lines --timefmt '%H:%M:%S'
-                --set 'format x "%H:%M:%S"'
+                --extracmds 'set format x "%H:%M:%S"'
 
 This plots the 'idle' CPU consumption against time.
 
@@ -1256,10 +1181,10 @@ data file can be plotted simply with
 
  $ ./data
 
-The caveats here are that on Linux the whole #! line is limited to 127
+The caveats here are that on Linux the whole #! line is limited to 127 charaters
-characters and that the full path to feedgnuplot must be given. The 127
+and that the full path to feedgnuplot must be given. The 127 character limit is
-character limit is a serious limitation, but this can likely be resolved with a
+a serious limitation, but this can likely be resolved with a kernel patch. I
-kernel patch. I have only tried on Linux 2.6.
+have only tried on Linux 2.6.
 
 =head3 Self-plotting data with perl inline data
 
@@ -1305,14 +1230,14 @@ it to the plotter.
 
 =item
 
---C<[no]domain>
+--[no]domain
 
 If enabled, the first element of each line is the domain variable. If not, the
 point index is used
 
 =item
 
---C<[no]dataid>
+--[no]dataid
 
 If enabled, each data point is preceded by the ID of the data set that point
 corresponds to. This ID is interpreted as a string, NOT as just a number. If not
@@ -1324,23 +1249,23 @@ As an example, if line 3 of the input is "0 9 1 20" then
 
 =item
 
-C<--nodomain --nodataid> would parse the 4 numbers as points in 4 different
+'--nodomain --nodataid' would parse the 4 numbers as points in 4 different
 curves at x=3
 
 =item
 
-C<--domain --nodataid> would parse the 4 numbers as points in 3 different
+'--domain --nodataid' would parse the 4 numbers as points in 3 different
 curves at x=0. Here, 0 is the x-variable and 9,1,20 are the data values
 
 =item
 
-C<--nodomain --dataid> would parse the 4 numbers as points in 2 different
+'--nodomain --dataid' would parse the 4 numbers as points in 2 different
 curves at x=3. Here 0 and 1 are the data IDs and 9 and 20 are the
 data values
 
 =item
 
-C<--domain --dataid> would parse the 4 numbers as a single point at
+'--domain --dataid' would parse the 4 numbers as a single point at
 x=0. Here 9 is the data ID and 1 is the data value. 20 is an extra
 value, so it is ignored. If another value followed 20, we'd get another
 point in curve ID 20
@@ -1349,20 +1274,20 @@ point in curve ID 20
 
 =item
 
-C<--[no]3d>
+--[no]3d
 
-Do [not] plot in 3D. This only makes sense with C<--domain>. Each domain here is
+Do [not] plot in 3D. This only makes sense with --domain. Each domain here is an
-an (x,y) tuple
+(x,y) tuple
 
 =item
 
---C<timefmt [format]>
+--timefmt [format]
 
 Interpret the X data as a time/date, parsed with the given format
 
 =item
 
-C<--colormap>
+--colormap
 
 Show a colormapped xy plot. Requires extra data for the color. zmin/zmax can be
 used to set the extents of the colors. Automatically increments
@@ -1370,7 +1295,7 @@ C<--extraValuesPerPoint>
 
 =item
 
-C<--stream [period]>
+--stream [period]
 
 Plot the data as it comes in, in realtime. If period is given, replot every
 period seconds. If no period is given, replot at 1Hz. If the period is given as
@@ -1379,19 +1304,19 @@ L</"Real-time streaming data"> section of the man page.
 
 =item
 
-C<--[no]lines>
+--[no]lines
 
 Do [not] draw lines to connect consecutive points
 
 =item
 
-C<--[no]points>
+--[no]points
 
 Do [not] draw points
 
 =item
 
-C<--circles>
+--circles
 
 Plot with circles. This requires a radius be specified for each point.
 Automatically increments C<--extraValuesPerPoint>). C<Not> supported for 3d
@@ -1399,35 +1324,35 @@ plots.
 
 =item
 
-C<--title xxx>
+--title xxx
 
 Set the title of the plot
 
 =item
 
-C<--legend curveID legend>
+--legend curveID legend
 
 Set the label for a curve plot. Use this option multiple times for multiple
-curves. With C<--dataid>, curveID is the ID. Otherwise, it's the index of the
+curves. With --dataid, curveID is the ID. Otherwise, it's the index of the
 curve, starting at 0
 
 =item
 
-C<--autolegend>
+--autolegend
 
-Use the curve IDs for the legend. Titles given with C<--legend> override these
+Use the curve IDs for the legend. Titles given with --legend override these
 
 =item
 
-C<--xlen xxx>
+--xlen xxx
 
-When using C<--stream>, sets the size of the x-window to plot. Omit this or set
+When using --stream, sets the size of the x-window to plot. Omit this or set it
-it to 0 to plot ALL the data. Does not make sense with 3d plots. Implies
+to 0 to plot ALL the data. Does not make sense with 3d plots. Implies
-C<--monotonic>
+--monotonic
 
 =item
 
-C<--xmin/xmax/ymin/ymax/y2min/y2max/zmin/zmax xxx>
+--xmin/xmax/ymin/ymax/y2min/y2max/zmin/zmax xxx
 
 Set the range for the given axis. These x-axis bounds are ignored in a streaming
 plot. The y2-axis bound do not apply in 3d plots. The z-axis bounds apply
@@ -1435,52 +1360,52 @@ I<only> to 3d plots or colormaps.
 
 =item
 
-C<--xlabel/ylabel/y2label/zlabel xxx>
+--xlabel/ylabel/y2label/zlabel xxx
 
 Label the given axis. The y2-axis label does not apply to 3d plots while the
 z-axis label applies I<only> to 3d plots.
 
 =item
 
-C<--y2 xxx>
+--y2 xxx
 
-Plot the data specified by this curve ID on the y2 axis. Without C<--dataid>,
+Plot the data specified by this curve ID on the y2 axis. Without --dataid, the
-the ID is just an ordered 0-based index. Does not apply to 3d plots. Can be
+ID is just an ordered 0-based index. Does not apply to 3d plots. Can be passed
-passed multiple times, or passed a comma-separated list. By default the y2-axis
+multiple times, or passed a comma-separated list. By default the y2-axis curves
-curves look the same as the y-axis ones. I.e. the viewer of the resulting plot
+look the same as the y-axis ones. I.e. the viewer of the resulting plot has to
-has to be told which is which via an axes label, legend, etc. Prior to version
+be told which is which via an axes label, legend, etc. Prior to version 1.25 of
-1.25 of feedgnuplot the curves plotted on the y2 axis were drawn with a thicker
+feedgnuplot the curves plotted on the y2 axis were drawn with a thicker line.
-line. This is no longer the case, but that behavior can be brought back by
+This is no longer the case, but that behavior can be brought back by passing
-passing something like
+something like
 
- --y2 curveid --style curveid 'linewidth 3'
+ --y2 curveid --curvestyle curveid 'linewidth 3'
 
 =item
 
-C<--histogram curveID>
+--histogram curveID
 
 
 Set up a this specific curve to plot a histogram. The bin width is given with
-the C<--binwidth> option (assumed 1.0 if omitted). C<--histogram> does I<not>
+the --binwidth option (assumed 1.0 if omitted). --histogram does NOT touch the
-touch the drawing style. It is often desired to plot these with boxes, and this
+drawing style. It is often desired to plot these with boxes, and this MUST be
-I<must> be explicitly requested by C<--with boxes>. This works with C<--domain>
+explicitly requested with --curvestyleall 'with boxes'. This works with --domain
-and/or C<--stream>, but in those cases the x-value is used I<only> to cull old
+and/or --stream, but in those cases the x-value is used ONLY to cull old data
-data because of C<--xlen> or C<--monotonic>. I.e. the x-values are I<not> drawn
+because of --xlen or --monotonic. I.e. the x-values are NOT drawn in any way.
-in any way. Can be passed multiple times, or passed a comma- separated list
+Can be passed multiple times, or passed a comma- separated list
 
 =item
 
-C<--binwidth width>
+--binwidth width
 
 The width of bins when making histograms. This setting applies to ALL histograms
 in the plot. Defaults to 1.0 if not given.
 
 =item
 
-C<--histstyle style>
+--histstyle style
 
 Normally, histograms are generated with the 'smooth freq' gnuplot style.
-C<--histstyle> can be used to select different 'smooth' settings. Allowed are
+--histstyle can be used to select different 'smooth' settings. Allowed are
 'unique', 'cumulative' and 'cnormal'. 'unique' indicates whether a bin has at
 least one item in it: instead of counting the items, it'll always report 0 or 1.
 'cumulative' is the integral of the "normal" histogram. 'cnormal' is like
@@ -1488,100 +1413,58 @@ least one item in it: instead of counting the items, it'll always report 0 or 1.
 
 =item
 
-C<--style curveID style>
+--curvestyle curveID
 
-Additional styles per curve. With C<--dataid>, curveID is the ID. Otherwise,
+style Additional styles per curve. With --dataid, curveID is the ID. Otherwise,
 it's the index of the curve, starting at 0. Use this option multiple times for
-multiple curves. C<--styleall> does I<not> apply to curves that have a
+multiple curves. --curvestylall does NOT apply to curves that have a
-C<--style>
+--curvestyle
 
 =item
 
-C<--curvestyle curveID>
+--curvestyleall xxx
 
-Synonym for C<--style>
+Additional styles for all curves that have no --curvestyle
 
 =item
 
-C<--styleall xxx>
+--extracmds xxx
 
-Additional styles for all curves that have no C<--style>. This is overridden by
+Additional commands. These could contain extra global styles for instance. Can
-any applicable C<--style>. Exclusive with C<--with>.
+be passed multiple times.
 
 =item
 
-C<--curvestyleall xxx>
+--square
-
-Synonym for C<--styleall>
-
-=item
-
-C<--with xxx>
-
-Same as C<--styleall>, but prefixed with "with". Thus
-
- --with boxes
-
-is equivalent to
-
- --styleall 'with boxes'
-
-Exclusive with C<--styleall>.
-
-=item
-
-C<--extracmds xxx>
-
-Additional commands to pass on to gnuplot verbatim. These could contain extra
-global styles for instance. Can be passed multiple times.
-
-=item
-
-C<--set xxx>
-
-Additional 'set' commands to pass on to gnuplot verbatim. C<--set 'a b c'> will
-result in gnuplot seeing a C<set a b c> command. Can be passed multiple times.
-
-=item
-
-C<--unset xxx>
-
-Additional 'unset' commands to pass on to gnuplot verbatim. C<--unset 'a b c'>
-will result in gnuplot seeing a C<unset a b c> command. Can be passed multiple
-times.
-
-=item
-
-C<--square>
 
 Plot data with aspect ratio 1. For 3D plots, this controls the aspect ratio for
 all 3 axes
 
 =item
 
-C<--square_xy>
+--square_xy
 
 For 3D plots, set square aspect ratio for ONLY the x,y axes
 
 =item
 
-C<--hardcopy xxx>
+--hardcopy xxx
 
 If not streaming, output to a file specified here. Format inferred from
-filename, unless specified by C<--terminal>
+filename, unless specified by --terminal
 
 =item
 
-C<--terminal xxx>
+--terminal xxx
 
 String passed to 'set terminal'. No attempts are made to validate this.
-C<--hardcopy> sets this to some sensible defaults if --hardcopy is given .png,
+--hardcopy sets this to some sensible defaults if --hardcopy is given .png,
-.pdf, .ps, .eps or .svg. If any other file type is desired, use both
+.pdf, .ps, .eps or .svg. If any other file type is desired, use both --hardcopy
-C<--hardcopy> and C<--terminal>
+and --terminal
 
 =item
 
-C<--maxcurves xxx>
+--maxcurves xxx
 
 The maximum allowed number of curves. This is 100 by default, but can be reset
 with this option. This exists purely to prevent perl from allocating all of the
@@ -1589,34 +1472,34 @@ system's memory when reading bogus data
 
 =item
 
-C<--monotonic>
+--monotonic
 
-If C<--domain> is given, checks to make sure that the x- coordinate in the input
+If --domain is given, checks to make sure that the x- coordinate in the input
 data is monotonically increasing. If a given x-variable is in the past, all data
-currently cached for this curve is purged. Without C<--monotonic>, all data is
+currently cached for this curve is purged. Without --monotonic, all data is
-kept. Does not make sense with 3d plots. No C<--monotonic> by default. The data is
+kept. Does not make sense with 3d plots. No --monotonic by default. The data is
 replotted before being purged
 
 =item
 
-C<--extraValuesPerPoint xxx>
+--extraValuesPerPoint
 
-How many extra values are given for each data point. Normally this is 0, and
+xxx How many extra values are given for each data point. Normally this is 0, and
 does not need to be specified, but sometimes we want extra data, like for colors
 or point sizes or error bars, etc. feedgnuplot options that require this
 (colormap, circles) automatically set it. This option is ONLY needed if unknown
-styles are used, with C<--styleall> or C<--with> for instance
+styles are used, with --curvestyleall for instance
 
 =item
 
-C<--dump>
+--dump
 
 Instead of printing to gnuplot, print to STDOUT. Very useful for debugging. It
 is possible to send the output produced this way to gnuplot directly.
 
 =item
 
-C<--exit>
+--exit
 
 Terminate the feedgnuplot process after passing data to gnuplot. The window will
 persist but will not be interactive. Without this option feedgnuplot keeps
@@ -1625,13 +1508,13 @@ later versions of gnuplot and only with some gnuplot terminals.
 
 =item
 
-C<--geometry>
+--geometry
 
 If using X11, specifies the size, position of the plot window
 
 =item
 
-C<--version>
+--version
 
 Print the version and exit
 
@@ -1678,7 +1561,7 @@ in a Thinkpad.
 =head2 Plotting a histogram of file sizes in a directory
 
  $ ls -l | awk '{print $5/1e6}' |
-   feedgnuplot --histogram 0 --with boxes --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
+   feedgnuplot --histogram 0 --curvestyleall 'with boxes' --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
 
 =head1 ACKNOWLEDGEMENT
 

completions/bash/feedgnuplot

@@ -7,17 +7,12 @@ complete -W               \
     --colormap            \
     --curvestyle          \
     --curvestyleall       \
-    --style               \
-    --styleall            \
-    --with                \
     --dataid              \
     --domain              \
     --dump                \
     --exit                \
     --extraValuesPerPoint \
     --extracmds           \
-    --set                 \
-    --unset               \
     --geometry            \
     --hardcopy            \
     --help                \

completions/zsh/_feedgnuplot

@@ -26,12 +26,8 @@ _arguments -S
     '--zmin:min Z:'                                                               \
     '--zmax:max Z:'                                                               \
     '*--y2:plot to place on the Y2 axis:'                                         \
-    '(--with)--curvestyleall[Additional styles for ALL curves]:style'             \
+    '--curvestyleall[Additional styles for ALL curves]:style'                     \
-    '(--with)--styleall[Additional styles for ALL curves]:style'                  \
-    '(--curvestyleall)--with[Additional styles for ALL curves]:style'             \
     '*--extracmds[Additional gnuplot commands]:command'                           \
-    '*--set[Additional 'set' gnuplot commands]:set-option'                        \
-    '*--unset[Additional 'unset' gnuplot commands]:unset-option'                  \
     '--square[Plot data with square aspect ratio]'                                \
     '--square_xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]'    \
     '--hardcopy[Plot to a file]:filename'                                         \
@@ -41,7 +37,6 @@ _arguments -S
     '--dump[Instead of printing to gnuplot, print to STDOUT]'                     \
     '--geometry[The X11 geometry string]:geometry string:'                        \
     '*--curvestyle[Additional styles for a curve]:curve id: :style:'              \
-    '*--style[Additional styles for a curve]:curve id: :style:'                   \
     '(--3d)*--histogram:plot to treat as a histogram:'                            \
     '--binwidth:Histogram bin width:'                                             \
     '--histstyle:Style of histogram:(frequency unique cumulative cnormal)'        \

debian/changelog

@@ -1,58 +0,0 @@
-feedgnuplot (1.30-1) unstable; urgency=low
-
-  * made the VCS links canonical
-  * added --set, --unset, --with, --style, --styleall
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 24 Jan 2014 15:50:03 -0800
-
-feedgnuplot (1.28-1) unstable; urgency=low
-
-  * Upstream update:
-    - Removed example debianization
-    - Removed unreliable unit tests from automated testing (Closes: #731080)
-  * gnuplot dependency now favors graphical gnuplot packages
-  * Removed Anton Gladky from the Uploaders
-
- -- Dima Kogan <dima@secretsauce.net>  Wed, 04 Dec 2013 02:05:08 -0800
-
-feedgnuplot (1.26-1) unstable; urgency=low
-
-  [ Dima Kogan ]
-  * Minor POD update
-  * Added test suite
-  * Added initial support for --timefmt. Currently time/date data is
-    supported only at the x-axis domain
-  * Added --exit option for force feedgnuplot to return even if gnuplot
-    may not yet be done rendering (patch by Eric Schulte)
-  * Reformatted the documentation
-  * y2-axis curves no longer have a thicker line by default
-  * --hardcopy now handles piped output (gnuplot 'set output |process'
-    syntax)
-
-  [ Anton Gladky ]
-  * Add libipc-run-perl to Build-Depends to execute tests
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Oct 2013 01:19:51 -0700
-
-feedgnuplot (1.24-2) unstable; urgency=low
-
-  * Now building the html documentation from the correct POD source
-
- -- Dima Kogan <dima@secretsauce.net>  Sun, 28 Apr 2013 17:42:52 -0700
-
-feedgnuplot (1.24-1) unstable; urgency=low
-
-  * Fixed regression in --monotonic. This works again now
-  * moved POD back into the main source file. This fixes the broken usage
-    messages
-  * added --version
-  * fixed watchfile to work with newer github pages
-  * priority now optional
-
- -- Dima Kogan <dima@secretsauce.net>  Fri, 08 Feb 2013 02:01:32 -0800
-
-feedgnuplot (1.23-2) unstable; urgency=low
-
-  * Initial Debian release (Closes: #686413)
-
- -- Dima Kogan <dima@secretsauce.net>  Tue, 30 Oct 2012 11:14:01 -0700

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -1,19 +0,0 @@
-Source: feedgnuplot
-Section: science
-Priority: optional
-Build-Depends: debhelper (>= 9), libstring-shellquote-perl, perl, gawk, gnuplot, libipc-run-perl
-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-Uploaders: Dima Kogan <dima@secretsauce.net>
-Standards-Version: 3.9.4
-Homepage: https://github.com/dkogan/feedgnuplot
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/feedgnuplot.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/feedgnuplot.git
-
-Package: feedgnuplot
-Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, gnuplot-qt | gnuplot-x11 | gnuplot
-Description: Pipe-oriented frontend to Gnuplot
- Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data
- coming in on STDIN or given in a filename passed on the commandline. Various
- data representations are supported, as is hardcopy output and streaming display
- of live data.

debian/feedgnuplot.doc-base

@@ -1,9 +0,0 @@
-Document: feedgnuplot
-Title: Feedgnuplot Manual
-Author: Dima Kogan
-Abstract: Formatted manpage for feedgnuplot
-Section: Science/Data Analysis
-
-Format: HTML
-Index: /usr/share/doc/feedgnuplot/feedgnuplot.html
-Files: /usr/share/doc/feedgnuplot/feedgnuplot.html

debian/feedgnuplot.docs

@@ -1 +0,0 @@
-feedgnuplot.html

debian/gbp.conf

@@ -1,4 +0,0 @@
-[DEFAULT]
-debian-branch = debian
-upstream-tag = v%(version)s
-pristine-tar = True

debian/rules

@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	dh_auto_build
-	pod2html --title=feedgnuplot bin/feedgnuplot > feedgnuplot.html
-
-override_dh_auto_clean:
-	rm -rf feedgnuplot.html pod2htm*
-	dh_auto_clean

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

debian/watch

@@ -1,4 +0,0 @@
-version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
-https://github.com/dkogan/feedgnuplot/tags .*/v?(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-# Bart Martens <bartm@debian.org>  Sat, 22 Dec 2012 12:54:18 +0000

package_definitions/debian/changelog

@@ -0,0 +1,111 @@
+feedgnuplot (1.22) unstable; urgency=low
+
+  * removed --size option
+
+ -- Dima Kogan <dima@secretsauce.net>  Mon, 03 Sep 2012 08:33:26 -0700
+
+feedgnuplot (1.21) unstable; urgency=low
+
+  * removed the POD from the script to its own file
+  * fixed regression to allow no given extracmds, histogram or y2
+    options
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 02 Sep 2012 23:52:21 -0700
+
+feedgnuplot (1.20) unstable; urgency=low
+
+  * no longer hardcoding 'x11' as the default terminal
+  * added histogram support
+  * generic terminals can now be requested
+  * --extracmds, --histogram, --y2 can now take comma-separated lists
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 31 Aug 2012 01:35:50 -0700
+
+feedgnuplot (1.19) unstable; urgency=low
+
+  * added --geometry option to specify plot dimensions
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 11 Feb 2012 21:04:42 -0800
+
+feedgnuplot (1.18) unstable; urgency=low
+
+  * data-ids can now include characters such as -. Any non-whitespace
+    works
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 27 Dec 2011 16:47:36 -0800
+
+feedgnuplot (1.17) unstable; urgency=low
+
+  [ Dima Kogan ]
+  * POD: removed -Winteractive, since this was apparently a mawk-ism
+  * added zsh and bash completions to the package
+
+  [ Hermann Schwarting ]
+  * add build dependency libtest-script-run-perl
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 20 Nov 2011 19:17:22 -0800
+
+feedgnuplot (1.16) unstable; urgency=low
+
+  * deb version parser now works for any package name
+  * Some POD fixes
+  * now building a native package
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 11 Nov 2011 00:10:18 -0800
+
+feedgnuplot (1.15-2) unstable; urgency=low
+
+  * added source format for the debianization
+  * added configuration to let git-buildpackage build this package
+  * standards bump to make lintian happier
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 23 Oct 2011 13:38:15 -0700
+
+feedgnuplot (1.15-1) unstable; urgency=low
+
+  * Renamed main script from feedGnuplot to feedgnuplot
+  * Slightly improved packaging, added instructions, etc
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 16 Oct 2011 11:58:15 -0700
+
+feedgnuplot (1.14-1) unstable; urgency=low
+
+  * New upstream release (added 'clear' command, documented commands)
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 22 May 2011 15:25:28 -0700
+
+feedgnuplot (1.13-1) unstable; urgency=low
+
+  * New upstream release (Better streaming plot control)
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 26 Apr 2011 14:24:09 -0700
+
+feedgnuplot (1.12-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Dima Kogan <dima@secretsauce.net>  Tue, 19 Apr 2011 11:02:23 -0700
+
+feedgnuplot (1.11-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 09 Apr 2011 14:10:21 -0700
+
+feedgnuplot (1.10-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 09 Apr 2011 14:08:06 -0700
+
+feedgnuplot (1.09-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 03 Apr 2011 17:23:38 -0700
+
+feedgnuplot (1.08-1) unstable; urgency=low
+
+  * Initial debianized release.
+
+ -- Dima Kogan <dima@secretsauce.net>  Sun, 6 Feb 2011 15:58:22 -0800

package_definitions/debian/compat

@@ -0,0 +1 @@
+7

package_definitions/debian/control

@@ -0,0 +1,20 @@
+Source: feedgnuplot
+Section: science
+Priority: extra
+Build-Depends: debhelper (>= 7), libtest-script-run-perl, perl
+Maintainer: Dima Kogan <dima@secretsauce.net>
+Uploaders: Dima Kogan <dima@secretsauce.net>
+Standards-Version: 3.9.3
+Homepage: https://github.com/dkogan/feedgnuplot
+Vcs-Git: git://github.com/dkogan/feedgnuplot.git
+Vcs-Browser: https://github.com/dkogan/feedgnuplot
+DM-Upload-Allowed: yes
+
+Package: feedgnuplot
+Architecture: all
+Depends: ${misc:Depends}, ${perl:Depends}, gnuplot
+Description: Pipe-oriented frontend to Gnuplot
+ Flexible, command-line-oriented frontend to Gnuplot. Creates plots from data
+ coming in on STDIN or given in a filename passed on the commandline. Various
+ data representations are supported, as is hardcopy output and streaming display
+ of live data.

package_definitions/debian/gbp.conf

@@ -0,0 +1,5 @@
+[DEFAULT]
+upstream-tree = branch
+upstream-branch = master
+debian-branch = master
+debian-tag = debian-%(version)s

package_definitions/debian/rules

@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@

package_definitions/debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

t/plots.t

@@ -5,9 +5,7 @@
 # change the way the output looks will show up as test failures. Currently the
 # reference plots come from gnuplot 4.6.4, and I make sure this is the version
 # we're testing with
-#
+
-# Note that some tests are only executed when the RUN_ALL_TESTS environment
-# variable is set.
 
 # require a threaded perl for my tests. This block lifted verbatim from the cpantesters wiki
 BEGIN {
@@ -605,6 +603,193 @@ tryplot( testname => '3d spiral with bounds, labels, square xy aspect ratio',
 
 
 
+EOF
+
+tryplot( testname => 'Histogram plot',
+         cmd      => q{seq 50 | awk '{print $1*$1}'},
+         options  => [qw(--lines --points),
+                      qw(--histo 0 --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
+         refplot  => <<'EOF' );
+
+
+    4 ++----------****----------+------------+-----------+------------+------------+-----------++
+      +           *+**          +            +           +            +            +            +
+      |           * **                                                                          |
+      |           * **                                                                          |
+  3.5 ++          * **                                                                         ++
+      |           * **                                                                          |
+      |           * **                                                                          |
+      |           * **                                                                          |
+      |           * **                                                                          |
+    3 ++          * ***                                                                        ++
+      |           * ***                                                                         |
+      |           * ***                                                                         |
+      |           * ***                                                                         |
+  2.5 ++          * ***                                                                        ++
+      |           * ***                                                                         |
+      |           * ***                                                                         |
+      |           * ***                                                                         |
+    2 ++          * **** ***                                                                   ++
+      |           * **** ***                                                                    |
+      |           * **** ***                                                                    |
+      |           * **** ***                                                                    |
+      |           * **** ***                                                                    |
+  1.5 ++          * **** ***                                                                   ++
+      |           * **** ***                                                                    |
+      |           * **** ***                                                                    |
+      |           * **** ***                                                                    |
+    1 ++          * ************************** ******** ************************** **          ++
+      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
+      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
+      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
+      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
+  0.5 ++          * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **          ++
+      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
+      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
+      +           *+**** *** **** *** **** *** **** *** **** *** **** *** **** *** **           +
+    0 ++----------****************************-********-**************************-**----------++
+    -500           0           500          1000        1500         2000         2500         3000
+
+EOF
+
+tryplot( testname => 'Cumulative histogram',
+         cmd      => q{seq 50 | awk '{print $1*$1}'},
+         options  => [qw(--lines --points),
+                      qw(--histo 0 --histstyle cum --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
+         refplot  => <<'EOF' );
+
+
+  50 ++-----------+------------+------------+------------+------------+-----------***----------++
+     +            +            +            +            +            +      ** ***+*           +
+     |                                                                     **** *** *           |
+     |                                                                 *** **** *** *           |
+     |                                                              ** *** **** *** *           |
+     |                                                           ***** *** **** *** *           |
+     |                                                        **** *** *** **** *** *           |
+  40 ++                                                    ** **** *** *** **** *** *          ++
+     |                                                 ****** **** *** *** **** *** *           |
+     |                                              ***** *** **** *** *** **** *** *           |
+     |                                            *** *** *** **** *** *** **** *** *           |
+     |                                         ****** *** *** **** *** *** **** *** *           |
+     |                                        ** **** *** *** **** *** *** **** *** *           |
+     |                                    ****** **** *** *** **** *** *** **** *** *           |
+  30 ++                                  *** *** **** *** *** **** *** *** **** *** *          ++
+     |                                ****** *** **** *** *** **** *** *** **** *** *           |
+     |                               *** *** *** **** *** *** **** *** *** **** *** *           |
+     |                            ****** *** *** **** *** *** **** *** *** **** *** *           |
+     |                           ** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |                          *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |                       ****** **** *** *** **** *** *** **** *** *** **** *** *           |
+  20 ++                     *** *** **** *** *** **** *** *** **** *** *** **** *** *          ++
+     |                   ****** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |                   ** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |                  *** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |                 **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |               ****** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |              ** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+  10 ++             ** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *          ++
+     |             *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |             *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |             *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |           ***** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     |           * *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
+     +           *+*** **** ***+*** **** ***+*** **** ***+*** **** ***+*** **** ***+*           +
+   0 ++----------********************************************-********+***-****-*****----------++
+   -500           0           500          1000         1500         2000         2500         3000
+
+EOF
+
+tryplot( testname => 'Circles',
+         cmd      => q{seq 5 | awk '{print $1,$1,$1/10}'},
+         options  => [qw(--circles --domain)],
+         refplot  => <<'EOF' );
+
+
+    5 ++-------+--------+--------+--------+--------+--------+--------+--------*******************
+      +        +        +        +        +        +        +        +        *        +       *+
+      |                                                              *        *                *|
+      |                                                          ********     *                *|
+  4.5 ++                                                        **      **    *                *+
+      |                                                        **        **   **              **|
+      |                                                       **          **   **            ** |
+      |                                                       *            *    **          **  |
+      |                                                       *            *     **        **   |
+    4 ++                                                      *            **     **********   ++
+      |                                                       *            *                    |
+      |                                                       *            *                    |
+      |                                            *          *            *                    |
+  3.5 ++                                        ******        **          **                   ++
+      |                                        *      *        **        **                     |
+      |                                       *        *        **      **                      |
+      |                                       *        *         ********                       |
+    3 ++                                      *        **                                      ++
+      |                                       *        *                                        |
+      |                                       *        *                                        |
+      |                                       *        *                                        |
+      |                                        *      *                                         |
+  2.5 ++                         *              ******                                         ++
+      |                       ******                                                            |
+      |                      **    **                                                           |
+      |                      *      *                                                           |
+    2 ++                     *      **                                                         ++
+      |                      *      **                                                          |
+      |                      *      *                                                           |
+      |                      **    **                                                           |
+      |                       ******                                                            |
+  1.5 ++                                                                                       ++
+      |                                                                                         |
+      |        *                                                                                |
+      +      ****       +        +        +        +        +        +        +        +        +
+    1 ++-----*-+**------+--------+--------+--------+--------+--------+--------+--------+-------++
+     0.5       1       1.5       2       2.5       3       3.5       4       4.5       5       5.5
+
+EOF
+
+tryplot( testname => 'Error bars (using extraValuesPerPoint)',
+         cmd      => q{seq 5 | awk '{print $1,$1,$1/10}'},
+         options  => [qw(--domain),
+                      qw(--extraValuesPerPoint 1 --curvestyle 0), 'with errorbars'],
+         refplot  => <<'EOF' );
+
+
+  5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------**
+      +          +           +          +          +          +           +          +          *
+      |                                                                                         *
+    5 ++                                                                                       +A
+      |                                                                                         *
+      |                                                                                         *
+      |                                                                                         *
+  4.5 ++                                                                                       **
+      |                                                                  ***                    |
+      |                                                                   *                     |
+    4 ++                                                                  A                    ++
+      |                                                                   *                     |
+      |                                                                   *                     |
+      |                                                                  ***                    |
+  3.5 ++                                                                                       ++
+      |                                           ***                                           |
+      |                                            *                                            |
+    3 ++                                           A                                           ++
+      |                                            *                                            |
+      |                                            *                                            |
+      |                                           ***                                           |
+  2.5 ++                                                                                       ++
+      |                                                                                         |
+      |                     ***                                                                 |
+    2 ++                     A                                                                 ++
+      |                      *                                                                  |
+      |                     ***                                                                 |
+      |                                                                                         |
+  1.5 ++                                                                                       ++
+      |                                                                                         |
+      |                                                                                         |
+    1 A*                                                                                       ++
+      **                                                                                        |
+      |                                                                                         |
+      +          +           +          +          +          +           +          +          +
+  0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++
+      1         1.5          2         2.5         3         3.5          4         4.5         5
+
 EOF
 
 tryplot( testname => 'Monotonicity check',
@@ -795,210 +980,6 @@ tryplot( testname => '--timefmt plot with --monotonic',
 
 EOF
 
-tryplot( testname => 'Error bars (using extraValuesPerPoint)',
-         cmd      => q{seq 5 | awk '{print $1,$1,$1/10}'},
-         options  => [qw(--domain),
-                      qw(--extraValuesPerPoint 1 --curvestyle 0), 'with errorbars'],
-         refplot  => <<'EOF' );
-
-
-  5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------**
-      +          +           +          +          +          +           +          +          *
-      |                                                                                         *
-    5 ++                                                                                       +A
-      |                                                                                         *
-      |                                                                                         *
-      |                                                                                         *
-  4.5 ++                                                                                       **
-      |                                                                  ***                    |
-      |                                                                   *                     |
-    4 ++                                                                  A                    ++
-      |                                                                   *                     |
-      |                                                                   *                     |
-      |                                                                  ***                    |
-  3.5 ++                                                                                       ++
-      |                                           ***                                           |
-      |                                            *                                            |
-    3 ++                                           A                                           ++
-      |                                            *                                            |
-      |                                            *                                            |
-      |                                           ***                                           |
-  2.5 ++                                                                                       ++
-      |                                                                                         |
-      |                     ***                                                                 |
-    2 ++                     A                                                                 ++
-      |                      *                                                                  |
-      |                     ***                                                                 |
-      |                                                                                         |
-  1.5 ++                                                                                       ++
-      |                                                                                         |
-      |                                                                                         |
-    1 A*                                                                                       ++
-      **                                                                                        |
-      |                                                                                         |
-      +          +           +          +          +          +           +          +          +
-  0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++
-      1         1.5          2         2.5         3         3.5          4         4.5         5
-
-EOF
-
-
-SKIP:
-{
-
-# Some tests aren't 100% reliable, so I do not include them in automated testing. These are
-#
-# - Histogram and circle-plotting tests: these have inconsistent round-off
-#   behavior on different arches; specifically 32-bit and 64-bit x86. So both
-#   plots look fine, but not identical, thus the tests fail
-#
-# - Streaming tests. These tests have a temporal component, so the loading of
-#   the host machine can cause a test failure. It's fine pretty much all the
-#   time on my not-too-new laptop, but this is bad for automated testing
-
-skip "Skipping unreliable tests. Set RUN_ALL_TESTS environment variable to run them all", 18 unless $ENV{RUN_ALL_TESTS};
-
-
-tryplot( testname => 'Histogram plot',
-         cmd      => q{seq 50 | awk '{print $1*$1}'},
-         options  => [qw(--lines --points),
-                      qw(--histo 0 --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
-         refplot  => <<'EOF' );
-
-
-    4 ++----------****----------+------------+-----------+------------+------------+-----------++
-      +           *+**          +            +           +            +            +            +
-      |           * **                                                                          |
-      |           * **                                                                          |
-  3.5 ++          * **                                                                         ++
-      |           * **                                                                          |
-      |           * **                                                                          |
-      |           * **                                                                          |
-      |           * **                                                                          |
-    3 ++          * ***                                                                        ++
-      |           * ***                                                                         |
-      |           * ***                                                                         |
-      |           * ***                                                                         |
-  2.5 ++          * ***                                                                        ++
-      |           * ***                                                                         |
-      |           * ***                                                                         |
-      |           * ***                                                                         |
-    2 ++          * **** ***                                                                   ++
-      |           * **** ***                                                                    |
-      |           * **** ***                                                                    |
-      |           * **** ***                                                                    |
-      |           * **** ***                                                                    |
-  1.5 ++          * **** ***                                                                   ++
-      |           * **** ***                                                                    |
-      |           * **** ***                                                                    |
-      |           * **** ***                                                                    |
-    1 ++          * ************************** ******** ************************** **          ++
-      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
-      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
-      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
-      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
-  0.5 ++          * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **          ++
-      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
-      |           * **** *** **** *** **** *** **** *** **** *** **** *** **** *** **           |
-      +           *+**** *** **** *** **** *** **** *** **** *** **** *** **** *** **           +
-    0 ++----------****************************-********-**************************-**----------++
-    -500           0           500          1000        1500         2000         2500         3000
-
-EOF
-
-tryplot( testname => 'Cumulative histogram',
-         cmd      => q{seq 50 | awk '{print $1*$1}'},
-         options  => [qw(--lines --points),
-                      qw(--histo 0 --histstyle cum --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
-         refplot  => <<'EOF' );
-
-
-  50 ++-----------+------------+------------+------------+------------+-----------***----------++
-     +            +            +            +            +            +      ** ***+*           +
-     |                                                                     **** *** *           |
-     |                                                                 *** **** *** *           |
-     |                                                              ** *** **** *** *           |
-     |                                                           ***** *** **** *** *           |
-     |                                                        **** *** *** **** *** *           |
-  40 ++                                                    ** **** *** *** **** *** *          ++
-     |                                                 ****** **** *** *** **** *** *           |
-     |                                              ***** *** **** *** *** **** *** *           |
-     |                                            *** *** *** **** *** *** **** *** *           |
-     |                                         ****** *** *** **** *** *** **** *** *           |
-     |                                        ** **** *** *** **** *** *** **** *** *           |
-     |                                    ****** **** *** *** **** *** *** **** *** *           |
-  30 ++                                  *** *** **** *** *** **** *** *** **** *** *          ++
-     |                                ****** *** **** *** *** **** *** *** **** *** *           |
-     |                               *** *** *** **** *** *** **** *** *** **** *** *           |
-     |                            ****** *** *** **** *** *** **** *** *** **** *** *           |
-     |                           ** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |                          *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |                       ****** **** *** *** **** *** *** **** *** *** **** *** *           |
-  20 ++                     *** *** **** *** *** **** *** *** **** *** *** **** *** *          ++
-     |                   ****** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |                   ** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |                  *** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |                 **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |               ****** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |              ** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-  10 ++             ** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *          ++
-     |             *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |             *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |             *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |           ***** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     |           * *** **** *** *** **** *** *** **** *** *** **** *** *** **** *** *           |
-     +           *+*** **** ***+*** **** ***+*** **** ***+*** **** ***+*** **** ***+*           +
-   0 ++----------********************************************-********+***-****-*****----------++
-   -500           0           500          1000         1500         2000         2500         3000
-
-EOF
-
-tryplot( testname => 'Circles',
-         cmd      => q{seq 5 | awk '{print $1,$1,$1/10}'},
-         options  => [qw(--circles --domain)],
-         refplot  => <<'EOF' );
-
-
-    5 ++-------+--------+--------+--------+--------+--------+--------+--------*******************
-      +        +        +        +        +        +        +        +        *        +       *+
-      |                                                              *        *                *|
-      |                                                          ********     *                *|
-  4.5 ++                                                        **      **    *                *+
-      |                                                        **        **   **              **|
-      |                                                       **          **   **            ** |
-      |                                                       *            *    **          **  |
-      |                                                       *            *     **        **   |
-    4 ++                                                      *            **     **********   ++
-      |                                                       *            *                    |
-      |                                                       *            *                    |
-      |                                            *          *            *                    |
-  3.5 ++                                        ******        **          **                   ++
-      |                                        *      *        **        **                     |
-      |                                       *        *        **      **                      |
-      |                                       *        *         ********                       |
-    3 ++                                      *        **                                      ++
-      |                                       *        *                                        |
-      |                                       *        *                                        |
-      |                                       *        *                                        |
-      |                                        *      *                                         |
-  2.5 ++                         *              ******                                         ++
-      |                       ******                                                            |
-      |                      **    **                                                           |
-      |                      *      *                                                           |
-    2 ++                     *      **                                                         ++
-      |                      *      **                                                          |
-      |                      *      *                                                           |
-      |                      **    **                                                           |
-      |                       ******                                                            |
-  1.5 ++                                                                                       ++
-      |                                                                                         |
-      |        *                                                                                |
-      +      ****       +        +        +        +        +        +        +        +        +
-    1 ++-----*-+**------+--------+--------+--------+--------+--------+--------+--------+-------++
-     0.5       1       1.5       2       2.5       3       3.5       4       4.5       5       5.5
-
-EOF
-
 
 
 
@@ -2168,7 +2149,6 @@ tryplot( testname => '--timefmt streaming plot with --monotonic',
 
 EOF
 
-}