Merge branch 'master' into debian

Changes

@@ -1,3 +1,15 @@
+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

Makefile.PL

@@ -63,7 +63,8 @@ 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-*' },
   );

bin/feedgnuplot

@@ -13,7 +13,7 @@ use Thread::Queue;
 use Pod::Usage;
 use Time::Piece;
 
-my $VERSION = 1.28;
+my $VERSION = 1.30;
 
 my %options;
 interpretCommandline();
@@ -107,14 +107,25 @@ 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
+  # needed for these to be parsed into an array-ref, these default to []
   $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@', 'curvestyle=s{2}', 'curvestyleall=s', 'extracmds=s@',
+             'zmin=f', 'zmax=f', 'y2=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',
@@ -138,9 +149,6 @@ 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))
   {
@@ -148,6 +156,22 @@ 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
@@ -203,6 +227,17 @@ 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
@@ -224,7 +259,7 @@ sub interpretCommandline
       exit -1;
     }
 
-    if ( defined $options{y2min} || defined $options{y2max} || defined $options{y2} )
+    if ( defined $options{y2min} || defined $options{y2max} || @{$options{y2}} )
     {
       print STDERR "--3d does not make sense with --y2...\n";
       exit -1;
@@ -486,7 +521,7 @@ sub mainThread
     }
 
 # For the specified values, set the legend entries to 'title "blah blah"'
-    if(defined $options{legend} && @{$options{legend}})
+    if(@{$options{legend}})
     {
       # @{$options{legend}} is a list where consecutive pairs are (curveID,
       # legend). I use $options{legend} here instead of $options{legend_hash}
@@ -501,7 +536,7 @@ sub mainThread
     }
 
 # add the extra curve options
-    if(defined $options{curvestyle} && @{$options{curvestyle}})
+    if(@{$options{curvestyle}})
     {
       # @{$options{curvestyle}} is a list where consecutive pairs are (curveID,
       # style). I use $options{curvestyle} here instead of
@@ -516,13 +551,7 @@ sub mainThread
     }
 
 # For the values requested to be printed on the y2 axis, set that
-    if( defined $options{y2} )
+    addCurveOption($_, 'axes x1y2') foreach (@{$options{y2}});
-    {
-      foreach (@{$options{y2}})
-      {
-        addCurveOption($_, 'axes x1y2');
-      }
-    }
 
 # timefmt
     if( $options{timefmt} )
@@ -532,26 +561,17 @@ sub mainThread
     }
 
 # add the extra global options
-    if(defined $options{extracmds})
+    print(PIPE "$_\n")       foreach (@{$options{extracmds}});
-    {
+    print(PIPE "set $_\n")   foreach (@{$options{set}});
-      foreach (@{$options{extracmds}})
+    print(PIPE "unset $_\n") foreach (@{$options{unset}});
-      {
-        print(PIPE "$_\n");
-      }
-    }
 
 # set up histograms
-    if( defined $options{histogram} )
-    {
     $options{binwidth} ||= 1;   # if no binwidth given, set it to 1
     print PIPE
       "set boxwidth $options{binwidth}\n" .
       "histbin(x) = $options{binwidth} * floor(0.5 + x/$options{binwidth})\n";
-      foreach (@{$options{histogram}})
+
-      {
+    setCurveAsHistogram( $_ ) foreach (@{$options{histogram}});
-        setCurveAsHistogram( $_ );
-      }
-    }
 
     # regexp for a possibly floating point, possibly scientific notation number
     my $numRE   = '-?\d*\.?\d+(?:[Ee][-+]?\d+)?';
@@ -568,7 +588,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";
@@ -787,9 +807,17 @@ sub updateCurveOptions
 
   my $titleoption = defined $title ? "title \"$title\"" : "notitle";
 
-  my $curvestyleall = '';
+  my ($curvestyleall);
-  $curvestyleall = $options{curvestyleall}
+  if( defined $options{curvestyle_hash}{$id} )
-    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} || '';
 
@@ -1027,14 +1055,21 @@ 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 the
+script. Anything not directly supported can still be done with options such as
-C<--extracmds> and C<--curvestyle> options. Arbitrary gnuplot commands can be
+C<--set>, C<--extracmds> C<--style>, etc. Arbitrary gnuplot commands can be
-passed in with C<--extracmds>. For example, to turn off the grid, pass in
+passed in with C<--extracmds>. For example, to turn off the grid, you can pass
-C<--extracmds 'unset grid'>. As many of these options as needed can be passed
+in C<--extracmds 'unset grid'>. Commands C<--set> and C<--unset> exists to
-in. To add arbitrary curve styles, use C<--curvestyle curveID extrastyle>. Pass
+provide nicer syntax, so this is equivalent to passing C<--unset grid>. As many
-these more than once to affect more than one curve. To apply an extra style to
+of these options as needed can be passed in. To add arbitrary curve styles, use
-I<all> the curves that lack an explicit C<--curvestyle>, pass in
+C<--style curveID extrastyle>. Pass these more than once to affect more than one
-C<--curvestyleall extrastyle>.
+curve.
+
+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
 
@@ -1050,7 +1085,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 --domain:
+the same command with C<--domain>:
 
  $ seq 5 | awk '{print 2*$1, $1*$1}' | feedgnuplot --domain
 
@@ -1081,14 +1116,13 @@ 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
+with C<--colormap> where each point contains the position I<and> the color.
-color. There are other gnuplot styles that require more data (such as error
+There are other gnuplot styles that require more data (such as error bars), but
-bars), but none of these are directly supported by the script. They can still be
+none of these are directly supported by the script. They can still be used,
-used, though, by specifying the specific style with C<--curvestyle>, and
+though, by specifying the specific style with C<--style>, and specifying how
-specifying how many extra values are needed for each point with
+many extra values are needed for each point with C<--extraValuesPerPoint extra>.
-C<--extraValuesPerPoint extra>. C<--extraValuesPerPoint> is ONLY needed for the
+C<--extraValuesPerPoint> is ONLY needed for the styles not explicitly supported;
-styles not explicitly supported; supported styles set that variable
+supported styles set that variable automatically.
-automatically.
 
 =head3 3D data
 
@@ -1131,7 +1165,7 @@ C<--timefmt>. Example:
    awk '$1 ~ /..:..:../ && $8 ~/^[0-9\.]*$/ {print $1,$8; fflush()}' |
    feedgnuplot --stream --domain
                 --lines --timefmt '%H:%M:%S'
-                --extracmds 'set format x "%H:%M:%S"'
+                --set 'format x "%H:%M:%S"'
 
 This plots the 'idle' CPU consumption against time.
 
@@ -1222,10 +1256,10 @@ data file can be plotted simply with
 
  $ ./data
 
-The caveats here are that on Linux the whole #! line is limited to 127 charaters
+The caveats here are that on Linux the whole #! line is limited to 127
-and that the full path to feedgnuplot must be given. The 127 character limit is
+characters and that the full path to feedgnuplot must be given. The 127
-a serious limitation, but this can likely be resolved with a kernel patch. I
+character limit is a serious limitation, but this can likely be resolved with a
-have only tried on Linux 2.6.
+kernel patch. I have only tried on Linux 2.6.
 
 =head3 Self-plotting data with perl inline data
 
@@ -1271,14 +1305,14 @@ it to the plotter.
 
 =item
 
---[no]domain
+--C<[no]domain>
 
 If enabled, the first element of each line is the domain variable. If not, the
 point index is used
 
 =item
 
---[no]dataid
+--C<[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
@@ -1290,23 +1324,23 @@ As an example, if line 3 of the input is "0 9 1 20" then
 
 =item
 
-'--nodomain --nodataid' would parse the 4 numbers as points in 4 different
+C<--nodomain --nodataid> would parse the 4 numbers as points in 4 different
 curves at x=3
 
 =item
 
-'--domain --nodataid' would parse the 4 numbers as points in 3 different
+C<--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
 
-'--nodomain --dataid' would parse the 4 numbers as points in 2 different
+C<--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
 
-'--domain --dataid' would parse the 4 numbers as a single point at
+C<--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
@@ -1315,20 +1349,20 @@ point in curve ID 20
 
 =item
 
---[no]3d
+C<--[no]3d>
 
-Do [not] plot in 3D. This only makes sense with --domain. Each domain here is an
+Do [not] plot in 3D. This only makes sense with C<--domain>. Each domain here is
-(x,y) tuple
+an (x,y) tuple
 
 =item
 
---timefmt [format]
+--C<timefmt [format]>
 
 Interpret the X data as a time/date, parsed with the given format
 
 =item
 
---colormap
+C<--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
@@ -1336,7 +1370,7 @@ C<--extraValuesPerPoint>
 
 =item
 
---stream [period]
+C<--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
@@ -1345,19 +1379,19 @@ L</"Real-time streaming data"> section of the man page.
 
 =item
 
---[no]lines
+C<--[no]lines>
 
 Do [not] draw lines to connect consecutive points
 
 =item
 
---[no]points
+C<--[no]points>
 
 Do [not] draw points
 
 =item
 
---circles
+C<--circles>
 
 Plot with circles. This requires a radius be specified for each point.
 Automatically increments C<--extraValuesPerPoint>). C<Not> supported for 3d
@@ -1365,35 +1399,35 @@ plots.
 
 =item
 
---title xxx
+C<--title xxx>
 
 Set the title of the plot
 
 =item
 
---legend curveID legend
+C<--legend curveID legend>
 
 Set the label for a curve plot. Use this option multiple times for multiple
-curves. With --dataid, curveID is the ID. Otherwise, it's the index of the
+curves. With C<--dataid>, curveID is the ID. Otherwise, it's the index of the
 curve, starting at 0
 
 =item
 
---autolegend
+C<--autolegend>
 
-Use the curve IDs for the legend. Titles given with --legend override these
+Use the curve IDs for the legend. Titles given with C<--legend> override these
 
 =item
 
---xlen xxx
+C<--xlen xxx>
 
-When using --stream, sets the size of the x-window to plot. Omit this or set it
+When using C<--stream>, sets the size of the x-window to plot. Omit this or set
-to 0 to plot ALL the data. Does not make sense with 3d plots. Implies
+it to 0 to plot ALL the data. Does not make sense with 3d plots. Implies
---monotonic
+C<--monotonic>
 
 =item
 
---xmin/xmax/ymin/ymax/y2min/y2max/zmin/zmax xxx
+C<--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
@@ -1401,52 +1435,52 @@ I<only> to 3d plots or colormaps.
 
 =item
 
---xlabel/ylabel/y2label/zlabel xxx
+C<--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
 
---y2 xxx
+C<--y2 xxx>
 
-Plot the data specified by this curve ID on the y2 axis. Without --dataid, the
+Plot the data specified by this curve ID on the y2 axis. Without C<--dataid>,
-ID is just an ordered 0-based index. Does not apply to 3d plots. Can be passed
+the ID is just an ordered 0-based index. Does not apply to 3d plots. Can be
-multiple times, or passed a comma-separated list. By default the y2-axis curves
+passed multiple times, or passed a comma-separated list. By default the y2-axis
-look the same as the y-axis ones. I.e. the viewer of the resulting plot has to
+curves look the same as the y-axis ones. I.e. the viewer of the resulting plot
-be told which is which via an axes label, legend, etc. Prior to version 1.25 of
+has to be told which is which via an axes label, legend, etc. Prior to version
-feedgnuplot the curves plotted on the y2 axis were drawn with a thicker line.
+1.25 of feedgnuplot the curves plotted on the y2 axis were drawn with a thicker
-This is no longer the case, but that behavior can be brought back by passing
+line. This is no longer the case, but that behavior can be brought back by
-something like
+passing something like
 
- --y2 curveid --curvestyle curveid 'linewidth 3'
+ --y2 curveid --style curveid 'linewidth 3'
 
 =item
 
---histogram curveID
+C<--histogram curveID>
 
 
 Set up a this specific curve to plot a histogram. The bin width is given with
-the --binwidth option (assumed 1.0 if omitted). --histogram does NOT touch the
+the C<--binwidth> option (assumed 1.0 if omitted). C<--histogram> does I<not>
-drawing style. It is often desired to plot these with boxes, and this MUST be
+touch the drawing style. It is often desired to plot these with boxes, and this
-explicitly requested with --curvestyleall 'with boxes'. This works with --domain
+I<must> be explicitly requested by C<--with boxes>. This works with C<--domain>
-and/or --stream, but in those cases the x-value is used ONLY to cull old data
+and/or C<--stream>, but in those cases the x-value is used I<only> to cull old
-because of --xlen or --monotonic. I.e. the x-values are NOT drawn in any way.
+data because of C<--xlen> or C<--monotonic>. I.e. the x-values are I<not> drawn
-Can be passed multiple times, or passed a comma- separated list
+in any way. Can be passed multiple times, or passed a comma- separated list
 
 =item
 
---binwidth width
+C<--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
 
---histstyle style
+C<--histstyle style>
 
 Normally, histograms are generated with the 'smooth freq' gnuplot style.
---histstyle can be used to select different 'smooth' settings. Allowed are
+C<--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
@@ -1454,58 +1488,100 @@ least one item in it: instead of counting the items, it'll always report 0 or 1.
 
 =item
 
---curvestyle curveID
+C<--style curveID style>
 
-style Additional styles per curve. With --dataid, curveID is the ID. Otherwise,
+Additional styles per curve. With C<--dataid>, curveID is the ID. Otherwise,
 it's the index of the curve, starting at 0. Use this option multiple times for
-multiple curves. --curvestylall does NOT apply to curves that have a
+multiple curves. C<--styleall> does I<not> apply to curves that have a
---curvestyle
+C<--style>
 
 =item
 
---curvestyleall xxx
+C<--curvestyle curveID>
 
-Additional styles for all curves that have no --curvestyle
+Synonym for C<--style>
 
 =item
 
---extracmds xxx
+C<--styleall xxx>
 
-Additional commands. These could contain extra global styles for instance. Can
+Additional styles for all curves that have no C<--style>. This is overridden by
-be passed multiple times.
+any applicable C<--style>. Exclusive with C<--with>.
 
 =item
 
---square
+C<--curvestyleall xxx>
+
+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
 
---square_xy
+C<--square_xy>
 
 For 3D plots, set square aspect ratio for ONLY the x,y axes
 
 =item
 
---hardcopy xxx
+C<--hardcopy xxx>
 
 If not streaming, output to a file specified here. Format inferred from
-filename, unless specified by --terminal
+filename, unless specified by C<--terminal>
 
 =item
 
---terminal xxx
+C<--terminal xxx>
 
 String passed to 'set terminal'. No attempts are made to validate this.
---hardcopy sets this to some sensible defaults if --hardcopy is given .png,
+C<--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 --hardcopy
+.pdf, .ps, .eps or .svg. If any other file type is desired, use both
-and --terminal
+C<--hardcopy> and C<--terminal>
 
 =item
 
---maxcurves xxx
+C<--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
@@ -1513,34 +1589,34 @@ system's memory when reading bogus data
 
 =item
 
---monotonic
+C<--monotonic>
 
-If --domain is given, checks to make sure that the x- coordinate in the input
+If C<--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 --monotonic, all data is
+currently cached for this curve is purged. Without C<--monotonic>, all data is
-kept. Does not make sense with 3d plots. No --monotonic by default. The data is
+kept. Does not make sense with 3d plots. No C<--monotonic> by default. The data is
 replotted before being purged
 
 =item
 
---extraValuesPerPoint
+C<--extraValuesPerPoint xxx>
 
-xxx How many extra values are given for each data point. Normally this is 0, and
+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 --curvestyleall for instance
+styles are used, with C<--styleall> or C<--with> for instance
 
 =item
 
---dump
+C<--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
 
---exit
+C<--exit>
 
 Terminate the feedgnuplot process after passing data to gnuplot. The window will
 persist but will not be interactive. Without this option feedgnuplot keeps
@@ -1549,13 +1625,13 @@ later versions of gnuplot and only with some gnuplot terminals.
 
 =item
 
---geometry
+C<--geometry>
 
 If using X11, specifies the size, position of the plot window
 
 =item
 
---version
+C<--version>
 
 Print the version and exit
 
@@ -1602,7 +1678,7 @@ in a Thinkpad.
 =head2 Plotting a histogram of file sizes in a directory
 
  $ ls -l | awk '{print $5/1e6}' |
-   feedgnuplot --histogram 0 --curvestyleall 'with boxes' --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
+   feedgnuplot --histogram 0 --with boxes --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
 
 =head1 ACKNOWLEDGEMENT
 

completions/bash/feedgnuplot

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

completions/zsh/_feedgnuplot

@@ -26,8 +26,12 @@ _arguments -S
     '--zmin:min Z:'                                                               \
     '--zmax:max Z:'                                                               \
     '*--y2:plot to place on the Y2 axis:'                                         \
-    '--curvestyleall[Additional styles for ALL curves]:style'                     \
+    '(--with)--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'                                         \
@@ -37,6 +41,7 @@ _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)'        \