version bump

I delete the with option after I use it. This is defensive and clarifies the
intent

Changes

@@ -1,3 +1,17 @@
+feedgnuplot (1.39)
+
+  * by default, histograms are plotted in expected ways
+
+ -- Dima Kogan <dima@secretsauce.net>  Sat, 15 Oct 2016 20:45:15 -0700
+
+feedgnuplot (1.38)
+
+  * hardcopy defaults:
+   - no enhanced text mode
+   - larger font size
+
+ -- Dima Kogan <dima@secretsauce.net>  Wed, 27 Jul 2016 22:15:11 -0700
+
 feedgnuplot (1.37)
 
   * At the end of a streaming plot, include the last chunk of data

bin/feedgnuplot

@@ -8,13 +8,13 @@ use Getopt::Long;
 use Time::HiRes qw( usleep gettimeofday tv_interval );
 use IO::Handle;
 use IO::Select;
-use List::Util qw( first );
+use List::Util qw( first any );
 use Scalar::Util qw( looks_like_number );
 use Text::ParseWords; # for shellwords
 use Pod::Usage;
 use Time::Piece;
 
-my $VERSION = 1.37;
+my $VERSION = 1.39;
 
 my %options;
 interpretCommandline();
@@ -138,17 +138,41 @@ sub interpretCommandline
   # --curvestyleall, so fill that in
   if( $options{styleall} )
   {
-    if($options{curvestyleall} )
-    {
-      $options{curvestyleall} .= " $options{styleall}";
-    }
-    else
-    {
-      $options{curvestyleall} = $options{styleall};
-    }
+    if($options{curvestyleall} ) { $options{curvestyleall} .= " $options{styleall}"; }
+    else                         { $options{curvestyleall}  =   $options{styleall};  }
+    delete $options{styleall};
   }
-  push @{$options{curvestyle}}, @{$options{style}};
 
+  push @{$options{curvestyle}}, @{$options{style}};
+  delete $options{style};
+
+  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}";
+    delete $options{with};
+  }
+
+  # If we're plotting histograms, then set the default histogram options for
+  # each histogram curve
+  #
+  # Apply this to plain (non-cumulative) histograms
+  if( !$options{curvestyleall} && $options{histstyle} =~ /freq|fnorm/ )
+  {
+      for my $hist_curve(@{$options{histogram}})
+      {
+          # If we don't specify any options specifically for this histogram, use
+          # the defaults: filled boxes with borders
+          if( !any { $options{curvestyle}[$_*2] eq $hist_curve } 0..(@{$options{curvestyle}}/2 - 1) )
+          {
+              push @{$options{curvestyle}}, ($hist_curve, 'with boxes fill solid border lt -1');
+          }
+      }
+  }
 
   # --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
@@ -231,17 +255,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
@@ -333,9 +346,9 @@ sub interpretCommandline
   # --xlen implies an order to the data, so I force monotonicity
   $options{monotonic} = 1 if defined $options{xlen};
 
-  if( $options{histstyle} !~ /freq|cum|uniq|cnorm/ )
+  if( $options{histstyle} !~ /freq|cum|uniq|cnorm|fnorm/ )
   {
-    print STDERR "unknown histstyle. Allowed are 'freq...', 'cum...', 'uniq...', 'cnorm...'\n";
+    print STDERR "unknown histstyle. Allowed are 'freq...', 'fnorm...', 'cum...', 'uniq...', 'cnorm...'\n";
     exit -1;
   }
 
@@ -497,11 +510,11 @@ sub mainThread
       }
 
       my %terminalOpts =
-      ( eps  => 'postscript solid color enhanced eps',
-        ps   => 'postscript solid color landscape 10',
-        pdf  => 'pdfcairo solid color font ",10" size 11in,8.5in',
-        png  => 'png size 1280,1024',
-        svg  => 'svg');
+      ( eps  => 'postscript noenhanced solid color enhanced eps',
+        ps   => 'postscript noenhanced solid color landscape 12',
+        pdf  => 'pdfcairo noenhanced solid color font ",12" size 11in,8.5in',
+        png  => 'png noenhanced size 1280,1024',
+        svg  => 'svg noenhanced');
 
       if( !defined $options{terminal} &&
            defined $outputfileType    &&
@@ -571,9 +584,7 @@ sub mainThread
     if(@{$options{curvestyle}})
     {
       # @{$options{curvestyle}} is a list where consecutive pairs are (curveID,
-      # style). I use $options{curvestyle} here instead of
-      # $options{curvestyle_hash} because I create a new curve when I see a new
-      # one, and the hash is unordered, thus messing up the ordering
+      # style).
       my $n = scalar @{$options{curvestyle}}/2;
       foreach my $idx (0..$n-1)
       {
@@ -605,11 +616,6 @@ sub mainThread
 
     setCurveAsHistogram( $_ ) foreach (@{$options{histogram}});
 
-    # set all the axis ranges
-    # If a bound isn't given I want to set it to the empty string, so I can communicate it simply to
-    # gnuplot
-    print PIPE "set xtics\n";
-
     if(@{$options{y2}})
     {
       print PIPE "set ytics nomirror\n";
@@ -851,19 +857,6 @@ sub updateCurveOptions
   { $title = $id; }
 
   my $titleoption = defined $title ? "title \"$title\"" : "notitle";
-
-  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} || '';
 
   my $usingoptions = '';
@@ -884,7 +877,7 @@ sub updateCurveOptions
       $usingoptions = "using 1:" . join(':', @rest);
   }
 
-  $curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions} $curvestyleall";
+  $curve->{options} = "$histoptions $usingoptions $titleoption $curve->{extraoptions} $options{curvestyleall}";
 }
 
 sub getCurve
@@ -1521,11 +1514,11 @@ passing something like
 
 C<--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>
-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>
+the C<--binwidth> option (assumed 1.0 if omitted). If a drawing style is not
+specified for this curve (C<--curvestyle>) or all curves (C<--with>,
+C<--curvestyleall>) then the default histogram style is set: filled boxes with
+borders. This is what the user generally wants. 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
@@ -1544,14 +1537,11 @@ C<--histstyle style>
 Normally, histograms are generated with the 'smooth frequency' gnuplot style.
 C<--histstyle> can be used to select different C<smooth> settings (see the
 gnuplot C<help smooth> page for more info). Allowed values are 'frequency' (the
-default), '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 'frequency' histogram. 'cnormal' is
-like 'cumulative', but rescaled to end up at 1.0. Note that there's no
-normalized 'frequency' option because gnuplot does not provide one.
-
-
-C<help smooth>
+default), 'fnormal' (available in very recent gnuplots), 'unique', 'cumulative'
+and 'cnormal'. 'fnormal' is a normalized histogram. '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 'frequency' histogram.
+'cnormal' is like 'cumulative', but rescaled to end up at 1.0.
 
 =item
 
@@ -1862,8 +1852,8 @@ in a Thinkpad.
 =head2 Plotting a histogram of file sizes in a directory, granular to 10MB
 
  $ ls -l | awk '{print $5/1e6}' |
-   feedgnuplot --histogram 0 --with boxes
-     --binwidth 10 --set 'style fill solid'
+   feedgnuplot --histogram 0
+     --binwidth 10
      --ymin 0 --xlabel 'File size (MB)' --ylabel Frequency
 
 =head1 ACKNOWLEDGEMENT

debian/changelog

@@ -0,0 +1,113 @@
+feedgnuplot (1.39-1) unstable; urgency=medium
+
+  * Upstream update:
+    - by default, histograms are plotted in expected ways
+    - No enhanced text mode in hardcopies, slightly larger font size
+
+ -- Dima Kogan <dkogan@debian.org>  Sat, 15 Oct 2016 20:45:15 -0700
+
+feedgnuplot (1.37-1) unstable; urgency=medium
+
+  * Upstream update: At the end of a streaming plot, include the last
+    chunk of data
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 01 Jan 2016 08:14:23 -0800
+
+feedgnuplot (1.36-1) unstable; urgency=medium
+
+  * Upstream update: added --equation to plot symbolic equations
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 13 Nov 2015 11:14:30 -0800
+
+feedgnuplot (1.35-1) unstable; urgency=medium
+
+  * Upstream update: fancier handling of termination conditions, no more
+    threading code
+
+ -- Dima Kogan <dima@secretsauce.net>  Mon, 02 Nov 2015 13:55:32 -0800
+
+feedgnuplot (1.34-2) unstable; urgency=medium
+
+  * Depends now works with the 'gnuplot5' packages
+
+ -- Dima Kogan <dima@secretsauce.net>  Fri, 10 Oct 2014 14:05:17 -0700
+
+feedgnuplot (1.34-1) unstable; urgency=medium
+
+  * Very minor upstream update
+  * gnuplot-nox can no satisfy the gnuplot dependency for feedgnuplot
+
+ -- Dima Kogan <dima@secretsauce.net>  Wed, 06 Aug 2014 15:19:56 -0700
+
+feedgnuplot (1.33-1) unstable; urgency=low
+
+  * Upstream update: fixed incorrect plotting of --timefmt --rangesize
+    plots
+
+ -- Dima Kogan <dima@secretsauce.net>  Thu, 06 Feb 2014 23:19:02 -0800
+
+feedgnuplot (1.32-1) unstable; urgency=low
+
+  * Added --rangesize and --rangesizeall. Different curves can now plot
+    different-size tuples
+
+ -- Dima Kogan <dima@secretsauce.net>  Wed, 05 Feb 2014 14:00:44 -0800
+
+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

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

debian/control

@@ -0,0 +1,20 @@
+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-nox | gnuplot5-qt | gnuplot5-x11 | gnuplot5-nox | 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/copyright

@@ -0,0 +1,24 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/dkogan/feedgnuplot
+Upstream-Contact: Dima Kogan, <dima@secretsauce.net>
+Upstream-Name: feedgnuplot
+
+Files: *
+Copyright: 2011, Dima Kogan <dima@secretsauce.net>
+License: Artistic or GPL-1+
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'.
+
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of version 1 of the
+ General Public License can be found in `/usr/share/common-licenses/GPL-1'.

debian/feedgnuplot.doc-base

@@ -0,0 +1,9 @@
+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

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

debian/feedgnuplot.install

@@ -0,0 +1,2 @@
+completions/bash/feedgnuplot /etc/bash_completion.d/
+completions/zsh/_feedgnuplot /usr/share/zsh/vendor-completions

debian/gbp.conf

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

debian/rules

@@ -0,0 +1,12 @@
+#!/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

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

debian/watch

@@ -0,0 +1,4 @@
+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

feedgnuplot.spec

@@ -0,0 +1,58 @@
+# Sample spec file for rpm-based systems. Debian-based systems already have this
+# packaged, so we do not ship those here
+
+Name:           feedgnuplot
+Version:        1.38
+Release:        1%{?dist}
+Summary:        Pipe-oriented frontend to Gnuplot
+BuildArch:      noarch
+
+License:        Artistic or GPL-1+
+URL:            https://www.github.com/dkogan/feedgnuplot/
+Source0:        https://www.github.com/dkogan/feedgnuplot/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+BuildRequires:  /usr/bin/pod2html
+BuildRequires:  perl-String-ShellQuote
+BuildRequires:  perl-ExtUtils-MakeMaker
+BuildRequires:  perl
+BuildRequires:  gawk
+BuildRequires:  gnuplot
+BuildRequires:  perl-IPC-Run
+
+Requires:       gnuplot
+
+%description
+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.
+
+%prep
+%setup -q
+
+%build
+perl Makefile.PL INSTALLDIRS=vendor
+make
+pod2html --title=feedgnuplot bin/feedgnuplot > feedgnuplot.html
+
+%install
+make install DESTDIR=%{buildroot} PREFIX=/usr
+
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
+cp Changes LICENSE feedgnuplot.html %{buildroot}%{_defaultdocdir}/%{name}
+
+mkdir -p %{buildroot}%{_datadir}/zsh/site-functions
+cp completions/zsh/* %{buildroot}%{_datadir}/zsh/site-functions
+
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
+cp completions/bash/* %{buildroot}%{_datadir}/bash-completion/completions
+
+rm -rf %{buildroot}/usr/lib64
+
+
+%files
+%{_bindir}/*
+%{_datadir}/zsh/*
+%{_datadir}/bash-completion/*
+%doc %{_defaultdocdir}/%{name}/*
+%doc %{_mandir}