From adbc8393f5f9576cb87a0970253e85a740e38dd4 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Wed, 4 Dec 2013 02:34:01 -0800
Subject: [PATCH 01/10] fixed spelling error in POD

---
 bin/feedgnuplot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index 269212d..5e4b9ec 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -1222,10 +1222,10 @@ data file can be plotted simply with
 
  $ ./data
 
-The caveats here are that on Linux the whole #! line is limited to 127 charaters
-and that the full path to feedgnuplot must be given. The 127 character limit is
-a serious limitation, but this can likely be resolved with a kernel patch. I
-have only tried on Linux 2.6.
+The caveats here are that on Linux the whole #! line is limited to 127
+characters and that the full path to feedgnuplot must be given. The 127
+character limit is a serious limitation, but this can likely be resolved with a
+kernel patch. I have only tried on Linux 2.6.
 
 =head3 Self-plotting data with perl inline data
 

From 64bce2a4251d9a7f864c36f4604f2d21c49a75b9 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Wed, 4 Dec 2013 20:44:54 -0800
Subject: [PATCH 02/10] added CPAN meta-data to require IPC::Run at build time

---
 Makefile.PL | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.PL b/Makefile.PL
index 584be4d..dd3ed3f 100644
--- a/Makefile.PL
+++ b/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-*' },
   );

From caea1285a9214e8141986e7dafb0ce874246ab18 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Wed, 4 Dec 2013 21:16:48 -0800
Subject: [PATCH 03/10] minor version bump

---
 Changes         | 6 ++++++
 bin/feedgnuplot | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changes b/Changes
index e684034..62c5a3a 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+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
diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index 5e4b9ec..c97b46d 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -13,7 +13,7 @@ use Thread::Queue;
 use Pod::Usage;
 use Time::Piece;
 
-my $VERSION = 1.28;
+my $VERSION = 1.29;
 
 my %options;
 interpretCommandline();

From 2b2bba9ff3a8aee93f395c7b5d05013d5c4a173f Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 24 Jan 2014 14:31:54 -0800
Subject: [PATCH 04/10] Cleaned up some option-parsing logic

$options{y2} and $options{extracmds} now default to [], so I never need to check
for defined $options{y2}.

This patch also changes some

 foreach()
 {
   dosomething();
 }

blocks into

 dosomething() foreach();
---
 bin/feedgnuplot | 47 +++++++++++++++++------------------------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index c97b46d..4ee506a 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -111,10 +111,14 @@ sub interpretCommandline
   $options{legend}     = [];
   $options{curvestyle} = [];
   $options{histogram}  = [];
+  $options{y2}         = [];
+  $options{extracmds}  = [];
+
   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@',
+             'curvestyle=s{2}', 'curvestyleall=s', 'extracmds=s@',
              'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s',
              'histogram=s@', 'binwidth=f', 'histstyle=s',
              'terminal=s',
@@ -224,7 +228,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 +490,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 +505,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 +520,7 @@ sub mainThread
     }
 
 # For the values requested to be printed on the y2 axis, set that
-    if( defined $options{y2} )
-    {
-      foreach (@{$options{y2}})
-      {
-        addCurveOption($_, 'axes x1y2');
-      }
-    }
+    addCurveOption($_, 'axes x1y2') foreach (@{$options{y2}});
 
 # timefmt
     if( $options{timefmt} )
@@ -532,26 +530,15 @@ sub mainThread
     }
 
 # add the extra global options
-    if(defined $options{extracmds})
-    {
-      foreach (@{$options{extracmds}})
-      {
-        print(PIPE "$_\n");
-      }
-    }
+    print(PIPE "$_\n")       foreach (@{$options{extracmds}});
 
 # 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( $_ );
-      }
-    }
+    $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";
+
+    setCurveAsHistogram( $_ ) foreach (@{$options{histogram}});
 
     # regexp for a possibly floating point, possibly scientific notation number
     my $numRE   = '-?\d*\.?\d+(?:[Ee][-+]?\d+)?';
@@ -568,7 +555,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";

From 20e9adbae49eb62572d83dac723e974160be05e1 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 24 Jan 2014 14:39:34 -0800
Subject: [PATCH 05/10] added "set" and "unset" options

---
 bin/feedgnuplot              | 44 ++++++++++++++++++++++++++----------
 completions/bash/feedgnuplot |  2 ++
 completions/zsh/_feedgnuplot |  2 ++
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index 4ee506a..c36094c 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -113,12 +113,14 @@ sub interpretCommandline
   $options{histogram}  = [];
   $options{y2}         = [];
   $options{extracmds}  = [];
+  $options{set}        = [];
+  $options{unset}      = [];
 
   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@',
+             'curvestyle=s{2}', 'curvestyleall=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',
@@ -531,6 +533,8 @@ sub mainThread
 
 # add the extra global options
     print(PIPE "$_\n")       foreach (@{$options{extracmds}});
+    print(PIPE "set $_\n")   foreach (@{$options{set}});
+    print(PIPE "unset $_\n") foreach (@{$options{unset}});
 
 # set up histograms
     $options{binwidth} ||= 1;   # if no binwidth given, set it to 1
@@ -1014,14 +1018,15 @@ 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
-C<--extracmds> and C<--curvestyle> options. Arbitrary gnuplot commands can be
-passed in with C<--extracmds>. For example, to turn off the grid, pass in
-C<--extracmds 'unset grid'>. As many of these options as needed can be passed
-in. To add arbitrary curve styles, use C<--curvestyle curveID extrastyle>. Pass
-these more than once to affect more than one curve. To apply an extra style to
-I<all> the curves that lack an explicit C<--curvestyle>, pass in
-C<--curvestyleall extrastyle>.
+script. Anything not directly supported can still be done with options such as
+C<--set>, C<--extracmds> C<--curvestyle>, etc. Arbitrary gnuplot commands can be
+passed in with C<--extracmds>. For example, to turn off the grid, you can pass
+in C<--extracmds 'unset grid'>. Commands C<--set> and C<--unset> exists to
+provide nicer syntax, so this is equivalent to passing C<--unset grid>. As many
+of these options as needed can be passed in. To add arbitrary curve styles, use
+C<--curvestyle curveID extrastyle>. Pass these more than once to affect more
+than one curve. To apply an extra style to I<all> the curves that lack an
+explicit C<--curvestyle>, pass in C<--curvestyleall extrastyle>.
 
 =head2 Data formats
 
@@ -1118,7 +1123,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.
 
@@ -1458,8 +1463,23 @@ Additional styles for all curves that have no --curvestyle
 
 --extracmds xxx
 
-Additional commands. These could contain extra global styles for instance. Can
-be passed multiple times.
+Additional commands to pass on to gnuplot verbatim. These could contain extra
+global styles for instance. Can be passed multiple times.
+
+=item
+
+--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
+
+--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
 
diff --git a/completions/bash/feedgnuplot b/completions/bash/feedgnuplot
index c0614f1..9ac627c 100644
--- a/completions/bash/feedgnuplot
+++ b/completions/bash/feedgnuplot
@@ -13,6 +13,8 @@ complete -W               \
     --exit                \
     --extraValuesPerPoint \
     --extracmds           \
+    --set                 \
+    --unset               \
     --geometry            \
     --hardcopy            \
     --help                \
diff --git a/completions/zsh/_feedgnuplot b/completions/zsh/_feedgnuplot
index fbc1a42..6c1ebec 100644
--- a/completions/zsh/_feedgnuplot
+++ b/completions/zsh/_feedgnuplot
@@ -28,6 +28,8 @@ _arguments -S
     '*--y2:plot to place on the Y2 axis:'                                         \
     '--curvestyleall[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'                                         \

From 1e3d01edd28478488d099e68969eafb7b1962638 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 24 Jan 2014 14:41:49 -0800
Subject: [PATCH 06/10] comment

---
 bin/feedgnuplot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index c36094c..aa3cdf3 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -107,7 +107,7 @@ 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{histogram}  = [];

From 35901fe6d1c6f97bb3ad563e9cbe3f82e5521c19 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 24 Jan 2014 15:17:51 -0800
Subject: [PATCH 07/10] added --with

---
 bin/feedgnuplot              | 77 +++++++++++++++++++++++++++---------
 completions/bash/feedgnuplot |  1 +
 completions/zsh/_feedgnuplot |  3 +-
 3 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index aa3cdf3..229408c 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -116,11 +116,14 @@ sub interpretCommandline
   $options{set}        = [];
   $options{unset}      = [];
 
+  $options{curvestyleall} = '';
+  $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@', 'set=s@', 'unset=s@',
+             'curvestyle=s{2}', 'curvestyleall=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',
@@ -144,9 +147,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))
   {
@@ -209,6 +209,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
@@ -778,9 +789,17 @@ sub updateCurveOptions
 
   my $titleoption = defined $title ? "title \"$title\"" : "notitle";
 
-  my $curvestyleall = '';
-  $curvestyleall = $options{curvestyleall}
-    if defined $options{curvestyleall} && !defined $options{curvestyle_hash}{$id};
+  my ($curvestyleall);
+  if( 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} || '';
 
@@ -1025,8 +1044,15 @@ in C<--extracmds 'unset grid'>. Commands C<--set> and C<--unset> exists to
 provide nicer syntax, so this is equivalent to passing C<--unset grid>. As many
 of these options as needed can be passed in. To add arbitrary curve styles, use
 C<--curvestyle curveID extrastyle>. Pass these more than once to affect more
-than one curve. To apply an extra style to I<all> the curves that lack an
-explicit C<--curvestyle>, pass in C<--curvestyleall extrastyle>.
+than one curve.
+
+To apply an extra style to I<all> the curves that lack an explicit
+C<--curvestyle>, pass in C<--curvestyleall 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<--curvestyleall 'with something'>.
+C<--curvestyleall> and C<--with> are mutually exclusive. Furthermore any
+curve-specific C<--curvestyle> overrides the global C<--curvestyleall> or
+C<--with> setting.
 
 =head2 Data formats
 
@@ -1421,10 +1447,10 @@ something like
 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
 drawing style. It is often desired to plot these with boxes, and this MUST be
-explicitly requested with --curvestyleall 'with boxes'. This works with --domain
-and/or --stream, but in those cases the x-value is used ONLY to cull old data
-because of --xlen or --monotonic. I.e. the x-values are NOT drawn in any way.
-Can be passed multiple times, or passed a comma- separated list
+explicitly requested by C<--with boxes>. This works with --domain and/or
+--stream, but in those cases the x-value is used ONLY to cull old data because
+of --xlen or --monotonic. I.e. the x-values are NOT drawn in any way. Can be
+passed multiple times, or passed a comma- separated list
 
 =item
 
@@ -1457,7 +1483,22 @@ multiple curves. --curvestylall does NOT apply to curves that have a
 
 --curvestyleall xxx
 
-Additional styles for all curves that have no --curvestyle
+Additional styles for all curves that have no --curvestyle. This is overridden
+by any applicable C<--curvestyle>. Exclusive with C<--with>.
+
+=item
+
+--with xxx
+
+Same as C<--curvestyleall>, but prefixed with "with". Thus
+
+ --with boxes
+
+is equivalent to
+
+ --curvestyleall 'with boxes'
+
+Exclusive with C<--curvestyleall>.
 
 =item
 
@@ -1530,13 +1571,13 @@ replotted before being purged
 
 =item
 
---extraValuesPerPoint
+--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<--curvestyleall> or C<--with> for instance
 
 =item
 
@@ -1609,7 +1650,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
 
diff --git a/completions/bash/feedgnuplot b/completions/bash/feedgnuplot
index 9ac627c..2b6d44a 100644
--- a/completions/bash/feedgnuplot
+++ b/completions/bash/feedgnuplot
@@ -7,6 +7,7 @@ complete -W               \
     --colormap            \
     --curvestyle          \
     --curvestyleall       \
+    --with                \
     --dataid              \
     --domain              \
     --dump                \
diff --git a/completions/zsh/_feedgnuplot b/completions/zsh/_feedgnuplot
index 6c1ebec..92030ae 100644
--- a/completions/zsh/_feedgnuplot
+++ b/completions/zsh/_feedgnuplot
@@ -26,7 +26,8 @@ _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'             \
+    '(--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'                  \

From c21c4d7e705f14651324a0b6a827ffb2d7d1a9da Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 24 Jan 2014 15:29:27 -0800
Subject: [PATCH 08/10] added --style, --styleall

---
 bin/feedgnuplot              | 87 +++++++++++++++++++++++-------------
 completions/bash/feedgnuplot |  2 +
 completions/zsh/_feedgnuplot |  2 +
 3 files changed, 61 insertions(+), 30 deletions(-)

diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index 229408c..28b90f6 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -110,6 +110,7 @@ sub interpretCommandline
   # 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}  = [];
@@ -117,13 +118,14 @@ sub interpretCommandline
   $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', 'with=s', 'extracmds=s@', 'set=s@', 'unset=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',
@@ -154,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
@@ -1038,21 +1056,20 @@ 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
-C<--set>, C<--extracmds> C<--curvestyle>, etc. 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, you can pass
 in C<--extracmds 'unset grid'>. Commands C<--set> and C<--unset> exists to
 provide nicer syntax, so this is equivalent to passing C<--unset grid>. As many
 of these options as needed can be passed in. To add arbitrary curve styles, use
-C<--curvestyle curveID extrastyle>. Pass these more than once to affect more
-than one curve.
+C<--style curveID extrastyle>. Pass these more than once to affect more than one
+curve.
 
-To apply an extra style to I<all> the curves that lack an explicit
-C<--curvestyle>, pass in C<--curvestyleall 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<--curvestyleall 'with something'>.
-C<--curvestyleall> and C<--with> are mutually exclusive. Furthermore any
-curve-specific C<--curvestyle> overrides the global C<--curvestyleall> or
-C<--with> setting.
+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
 
@@ -1099,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
-color. There are other gnuplot styles that require more data (such as error
-bars), but none of these are directly supported by the script. They can still be
-used, though, by specifying the specific style with C<--curvestyle>, and
-specifying how many extra values are needed for each point with
-C<--extraValuesPerPoint extra>. C<--extraValuesPerPoint> is ONLY needed for the
-styles not explicitly supported; supported styles set that variable
-automatically.
+with C<--colormap> where each point contains the position I<and> the color.
+There are other gnuplot styles that require more data (such as error bars), but
+none of these are directly supported by the script. They can still be used,
+though, by specifying the specific style with C<--style>, and specifying how
+many extra values are needed for each point with C<--extraValuesPerPoint extra>.
+C<--extraValuesPerPoint> is ONLY needed for the styles not explicitly supported;
+supported styles set that variable automatically.
 
 =head3 3D data
 
@@ -1437,7 +1453,7 @@ feedgnuplot the curves plotted on the y2 axis were drawn with a thicker line.
 This is no longer the case, but that behavior can be brought back by passing
 something like
 
- --y2 curveid --curvestyle curveid 'linewidth 3'
+ --y2 curveid --style curveid 'linewidth 3'
 
 =item
 
@@ -1472,33 +1488,44 @@ least one item in it: instead of counting the items, it'll always report 0 or 1.
 
 =item
 
+--style curveID 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. --styleall does I<not> apply to curves that have a --style
+
+=item
+
 --curvestyle curveID
 
-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. --curvestylall does NOT apply to curves that have a
---curvestyle
+Synonym for C<--style>
+
+=item
+
+--styleall xxx
+
+Additional styles for all curves that have no C<--style>. This is overridden by
+any applicable C<--style>. Exclusive with C<--with>.
 
 =item
 
 --curvestyleall xxx
 
-Additional styles for all curves that have no --curvestyle. This is overridden
-by any applicable C<--curvestyle>. Exclusive with C<--with>.
+Synonym for C<--styleall>
 
 =item
 
 --with xxx
 
-Same as C<--curvestyleall>, but prefixed with "with". Thus
+Same as C<--styleall>, but prefixed with "with". Thus
 
  --with boxes
 
 is equivalent to
 
- --curvestyleall 'with boxes'
+ --styleall 'with boxes'
 
-Exclusive with C<--curvestyleall>.
+Exclusive with C<--styleall>.
 
 =item
 
@@ -1577,7 +1604,7 @@ 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<--curvestyleall> or C<--with> for instance
+styles are used, with C<--styleall> or C<--with> for instance
 
 =item
 
diff --git a/completions/bash/feedgnuplot b/completions/bash/feedgnuplot
index 2b6d44a..0e5a7af 100644
--- a/completions/bash/feedgnuplot
+++ b/completions/bash/feedgnuplot
@@ -7,6 +7,8 @@ complete -W               \
     --colormap            \
     --curvestyle          \
     --curvestyleall       \
+    --style               \
+    --styleall            \
     --with                \
     --dataid              \
     --domain              \
diff --git a/completions/zsh/_feedgnuplot b/completions/zsh/_feedgnuplot
index 92030ae..a9766e6 100644
--- a/completions/zsh/_feedgnuplot
+++ b/completions/zsh/_feedgnuplot
@@ -27,6 +27,7 @@ _arguments -S
     '--zmax:max Z:'                                                               \
     '*--y2:plot to place on the Y2 axis:'                                         \
     '(--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'                        \
@@ -40,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)'        \

From f38a00bfd1ad82649e41f8d668a0d8cb8f1e6d7c Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 24 Jan 2014 15:47:34 -0800
Subject: [PATCH 09/10] docs now escape cmdline options with C<>

---
 bin/feedgnuplot | 151 ++++++++++++++++++++++++------------------------
 1 file changed, 76 insertions(+), 75 deletions(-)

diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index 28b90f6..e2e65f5 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -1085,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
 
@@ -1305,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
@@ -1324,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
@@ -1349,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
-(x,y) tuple
+Do [not] plot in 3D. This only makes sense with C<--domain>. Each domain here is
+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
@@ -1370,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
@@ -1379,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
@@ -1399,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
-to 0 to plot ALL the data. Does not make sense with 3d plots. Implies
---monotonic
+When using C<--stream>, sets the size of the x-window to plot. Omit this or set
+it to 0 to plot ALL the data. Does not make sense with 3d plots. Implies
+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
@@ -1435,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
-ID is just an ordered 0-based index. Does not apply to 3d plots. Can be passed
-multiple times, or passed a comma-separated list. By default the y2-axis curves
-look the same as the y-axis ones. I.e. the viewer of the resulting plot has to
-be told which is which via an axes label, legend, etc. Prior to version 1.25 of
-feedgnuplot the curves plotted on the y2 axis were drawn with a thicker line.
-This is no longer the case, but that behavior can be brought back by passing
-something like
+Plot the data specified by this curve ID on the y2 axis. Without C<--dataid>,
+the ID is just an ordered 0-based index. Does not apply to 3d plots. Can be
+passed multiple times, or passed a comma-separated list. By default the y2-axis
+curves look the same as the y-axis ones. I.e. the viewer of the resulting plot
+has to be told which is which via an axes label, legend, etc. Prior to version
+1.25 of feedgnuplot the curves plotted on the y2 axis were drawn with a thicker
+line. This is no longer the case, but that behavior can be brought back by
+passing something like
 
  --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
-drawing style. It is often desired to plot these with boxes, and this MUST be
-explicitly requested by C<--with boxes>. This works with --domain and/or
---stream, but in those cases the x-value is used ONLY to cull old data because
-of --xlen or --monotonic. I.e. the x-values are NOT drawn in any way. Can be
-passed multiple times, or passed a comma- separated list
+the C<--binwidth> option (assumed 1.0 if omitted). C<--histogram> does I<not>
+touch the drawing style. It is often desired to plot these with boxes, and this
+I<must> be explicitly requested by C<--with boxes>. This works with C<--domain>
+and/or C<--stream>, but in those cases the x-value is used I<only> to cull old
+data because of C<--xlen> or C<--monotonic>. I.e. the x-values are I<not> drawn
+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
@@ -1488,34 +1488,35 @@ least one item in it: instead of counting the items, it'll always report 0 or 1.
 
 =item
 
---style curveID style
+C<--style curveID 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. --styleall does I<not> apply to curves that have a --style
+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. C<--styleall> does I<not> apply to curves that have a
+C<--style>
 
 =item
 
---curvestyle curveID
+C<--curvestyle curveID>
 
 Synonym for C<--style>
 
 =item
 
---styleall xxx
+C<--styleall xxx>
 
 Additional styles for all curves that have no C<--style>. This is overridden by
 any applicable C<--style>. Exclusive with C<--with>.
 
 =item
 
---curvestyleall xxx
+C<--curvestyleall xxx>
 
 Synonym for C<--styleall>
 
 =item
 
---with xxx
+C<--with xxx>
 
 Same as C<--styleall>, but prefixed with "with". Thus
 
@@ -1529,21 +1530,21 @@ Exclusive with C<--styleall>.
 
 =item
 
---extracmds xxx
+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
 
---set xxx
+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
 
---unset xxx
+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
@@ -1551,36 +1552,36 @@ times.
 
 =item
 
---square
+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,
-.pdf, .ps, .eps or .svg. If any other file type is desired, use both --hardcopy
-and --terminal
+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
+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
@@ -1588,17 +1589,17 @@ 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
-kept. Does not make sense with 3d plots. No --monotonic by default. The data is
+currently cached for this curve is purged. Without C<--monotonic>, all data is
+kept. Does not make sense with 3d plots. No C<--monotonic> by default. The data is
 replotted before being purged
 
 =item
 
---extraValuesPerPoint xxx
+C<--extraValuesPerPoint 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
@@ -1608,14 +1609,14 @@ 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
@@ -1624,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
 

From 9387a85fe6f4f639f9f5404901c466cc88ad3ca3 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 24 Jan 2014 15:47:47 -0800
Subject: [PATCH 10/10] changelog bump

---
 Changes         | 6 ++++++
 bin/feedgnuplot | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changes b/Changes
index 62c5a3a..7f3c697 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+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
diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index e2e65f5..c4bee0e 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -13,7 +13,7 @@ use Thread::Queue;
 use Pod::Usage;
 use Time::Piece;
 
-my $VERSION = 1.29;
+my $VERSION = 1.30;
 
 my %options;
 interpretCommandline();