From: Steve Hancock <perltidy@users.sourceforge.net>
Date: Sun, 1 Dec 2019 01:59:20 +0000 (-0800)
Subject: preparing for release; set version to 20191207
X-Git-Tag: 20191203~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b481d4970b50c99811367a5edc8be2811115a960;p=perltidy.git

preparing for release; set version to 20191207
---

diff --git a/CHANGES.md b/CHANGES.md
index bda5a03f..d15f7c38 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,6 @@
 # Perltidy Change Log
 
-## 2019 09 15.01
+## 2019 12 07
 
     - Fixed issue RT#131115: -bli option not working correctly.
       Closing braces were not indented in some cases due to a glitch
@@ -16,7 +16,7 @@
 
     - Implement issue RT#130640: Allow different subroutine keywords.
       Added a flag --sub-alias-list=s or -sal=s, where s is a string with
-      one or more aliases for 'sub', separated by spaces or commas.  
+      one or more aliases for 'sub', separated by spaces or commas.
       For example,
 
         perltidy -sal='method fun' 
diff --git a/MANIFEST b/MANIFEST
index 78e9424a..e2d52ae6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -60,6 +60,7 @@ t/snippets12.t
 t/snippets13.t
 t/snippets14.t
 t/snippets15.t
+t/snippets16.t
 t/snippets2.t
 t/snippets3.t
 t/snippets4.t
diff --git a/bin/perltidy b/bin/perltidy
index 34d3d32a..edfe383d 100755
--- a/bin/perltidy
+++ b/bin/perltidy
@@ -3807,7 +3807,7 @@ perlstyle(1), Perl::Tidy(3)
 
 =head1 VERSION
 
-This man page documents perltidy version 20190915.01
+This man page documents perltidy version 20191207
 
 =head1 BUG REPORTS
 
diff --git a/docs/ChangeLog.html b/docs/ChangeLog.html
index 4ace19e7..97d8c141 100644
--- a/docs/ChangeLog.html
+++ b/docs/ChangeLog.html
@@ -1,15 +1,27 @@
 <h1>Perltidy Change Log</h1>
 
-<h2>2019 09 15.01</h2>
+<h2>2019 12 07</h2>
 
-<pre><code>- implement issue RT#130640: Allow different subroutine keywords.
+<pre><code>- Fixed issue RT#131115: -bli option not working correctly.
+  Closing braces were not indented in some cases due to a glitch
+  introduced in version 20181120.
+
+- Fixed issue RT#130394: Allow short nested blocks.  Given the following
+
+    $factorial = sub { reduce { $a * $b } 1 .. 11 };
+
+  Previous versions would always break the sub block because it
+  contains another block (the reduce block).  The fix keeps
+  short one-line blocks such as this intact.
+
+- Implement issue RT#130640: Allow different subroutine keywords.
   Added a flag --sub-alias-list=s or -sal=s, where s is a string with
-  one or more aliases for 'sub', separated by spaces or commas.  
+  one or more aliases for 'sub', separated by spaces or commas.
   For example,
 
     perltidy -sal='method fun' 
 
-  will cause the perltidy to treate the words 'method' and 'fun' to be
+  will cause the perltidy to treat the words 'method' and 'fun' to be
   treated the same as if they were 'sub'.
 
 - Added flag --space-prototype-paren=i, or -spp=i, to control spacing 
@@ -27,6 +39,12 @@
     sub usage();    # i=0 [no space]
     sub usage();    # i=1 [default; follows input]
     sub usage ();   # i=2 [space]
+
+- Fixed issue git#16, minor vertical alignment issue.
+
+- Fixed issue git#10, minor conflict of -wn and -ce
+
+- Improved some vertical alignments involving two lines.
 </code></pre>
 
 <h2>2019 09 15</h2>
diff --git a/docs/Tidy.html b/docs/Tidy.html
index 3babc560..7cfdae12 100644
--- a/docs/Tidy.html
+++ b/docs/Tidy.html
@@ -353,7 +353,7 @@
 
 <h1 id="VERSION">VERSION</h1>
 
-<p>This man page documents Perl::Tidy version 20190915.01</p>
+<p>This man page documents Perl::Tidy version 20191207</p>
 
 <h1 id="LICENSE">LICENSE</h1>
 
diff --git a/docs/perltidy.html b/docs/perltidy.html
index 34da9faf..9e96cf01 100644
--- a/docs/perltidy.html
+++ b/docs/perltidy.html
@@ -2930,7 +2930,7 @@
 
 <h1 id="VERSION">VERSION</h1>
 
-<p>This man page documents perltidy version 20190915.01</p>
+<p>This man page documents perltidy version 20191207</p>
 
 <h1 id="BUG-REPORTS">BUG REPORTS</h1>
 
diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm
index f0106612..cb28c0e4 100644
--- a/lib/Perl/Tidy.pm
+++ b/lib/Perl/Tidy.pm
@@ -110,7 +110,7 @@ BEGIN {
     # Release version must be bumped, and it is probably past time for a
     # release anyway.
 
-    $VERSION = '20190915.01';
+    $VERSION = '20191207';
 }
 
 sub streamhandle {
diff --git a/lib/Perl/Tidy.pod b/lib/Perl/Tidy.pod
index 10d0277c..a791a1c6 100644
--- a/lib/Perl/Tidy.pod
+++ b/lib/Perl/Tidy.pod
@@ -414,7 +414,7 @@ C<write_debug_entry> in Tidy.pm.
 
 =head1 VERSION
 
-This man page documents Perl::Tidy version 20190915.01
+This man page documents Perl::Tidy version 20191207
 
 =head1 LICENSE
 
diff --git a/lib/Perl/Tidy/Debugger.pm b/lib/Perl/Tidy/Debugger.pm
index 3dc14c8f..bf965dea 100644
--- a/lib/Perl/Tidy/Debugger.pm
+++ b/lib/Perl/Tidy/Debugger.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::Debugger;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/DevNull.pm b/lib/Perl/Tidy/DevNull.pm
index 6d5b5df1..3e1c2063 100644
--- a/lib/Perl/Tidy/DevNull.pm
+++ b/lib/Perl/Tidy/DevNull.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::DevNull;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 sub new   { my $self = shift; return bless {}, $self }
 sub print { return }
 sub close { return }
diff --git a/lib/Perl/Tidy/Diagnostics.pm b/lib/Perl/Tidy/Diagnostics.pm
index 41942c1e..1485054f 100644
--- a/lib/Perl/Tidy/Diagnostics.pm
+++ b/lib/Perl/Tidy/Diagnostics.pm
@@ -20,7 +20,7 @@
 package Perl::Tidy::Diagnostics;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/FileWriter.pm b/lib/Perl/Tidy/FileWriter.pm
index 60637835..0f2af6bf 100644
--- a/lib/Perl/Tidy/FileWriter.pm
+++ b/lib/Perl/Tidy/FileWriter.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::FileWriter;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 # Maximum number of little messages; probably need not be changed.
 my $MAX_NAG_MESSAGES = 6;
diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index 40436416..fd84ac3c 100644
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -12,7 +12,7 @@ package Perl::Tidy::Formatter;
 use strict;
 use warnings;
 use Carp;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 # The Tokenizer will be loaded with the Formatter
 ##use Perl::Tidy::Tokenizer;    # for is_keyword()
@@ -3601,6 +3601,7 @@ sub map_containers {
     else {
         # ok
     }
+    return;
 }
 
 sub mark_short_nested_blocks {
@@ -6295,6 +6296,7 @@ sub make_sub_matching_pattern {
         $SUB_PATTERN    =~ s/sub/\($sub_alias_list\)/;
         $ASUB_PATTERN   =~ s/sub/\($sub_alias_list\)/;
     }
+    return;
 }
 
 sub make_bli_pattern {
diff --git a/lib/Perl/Tidy/HtmlWriter.pm b/lib/Perl/Tidy/HtmlWriter.pm
index 3ab6ccdd..4c2fccff 100644
--- a/lib/Perl/Tidy/HtmlWriter.pm
+++ b/lib/Perl/Tidy/HtmlWriter.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::HtmlWriter;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 use File::Basename;
 
diff --git a/lib/Perl/Tidy/IOScalar.pm b/lib/Perl/Tidy/IOScalar.pm
index 20704eaf..3c45adf6 100644
--- a/lib/Perl/Tidy/IOScalar.pm
+++ b/lib/Perl/Tidy/IOScalar.pm
@@ -10,7 +10,7 @@ package Perl::Tidy::IOScalar;
 use strict;
 use warnings;
 use Carp;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 sub new {
     my ( $package, $rscalar, $mode ) = @_;
diff --git a/lib/Perl/Tidy/IOScalarArray.pm b/lib/Perl/Tidy/IOScalarArray.pm
index 86971bef..a3eacb44 100644
--- a/lib/Perl/Tidy/IOScalarArray.pm
+++ b/lib/Perl/Tidy/IOScalarArray.pm
@@ -14,7 +14,7 @@ package Perl::Tidy::IOScalarArray;
 use strict;
 use warnings;
 use Carp;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 sub new {
     my ( $package, $rarray, $mode ) = @_;
diff --git a/lib/Perl/Tidy/IndentationItem.pm b/lib/Perl/Tidy/IndentationItem.pm
index cb887543..a8b5e268 100644
--- a/lib/Perl/Tidy/IndentationItem.pm
+++ b/lib/Perl/Tidy/IndentationItem.pm
@@ -8,7 +8,7 @@
 package Perl::Tidy::IndentationItem;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/LineBuffer.pm b/lib/Perl/Tidy/LineBuffer.pm
index a788c491..cbd3da21 100644
--- a/lib/Perl/Tidy/LineBuffer.pm
+++ b/lib/Perl/Tidy/LineBuffer.pm
@@ -12,7 +12,7 @@
 package Perl::Tidy::LineBuffer;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/LineSink.pm b/lib/Perl/Tidy/LineSink.pm
index 75d9be6d..cb46a3ac 100644
--- a/lib/Perl/Tidy/LineSink.pm
+++ b/lib/Perl/Tidy/LineSink.pm
@@ -8,7 +8,7 @@
 package Perl::Tidy::LineSink;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/LineSource.pm b/lib/Perl/Tidy/LineSource.pm
index dfb21382..8358bcd4 100644
--- a/lib/Perl/Tidy/LineSource.pm
+++ b/lib/Perl/Tidy/LineSource.pm
@@ -8,7 +8,7 @@
 package Perl::Tidy::LineSource;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/Logger.pm b/lib/Perl/Tidy/Logger.pm
index 719300ab..bf7de090 100644
--- a/lib/Perl/Tidy/Logger.pm
+++ b/lib/Perl/Tidy/Logger.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::Logger;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 sub new {
 
diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm
index cafe0d6f..5293cfa4 100644
--- a/lib/Perl/Tidy/Tokenizer.pm
+++ b/lib/Perl/Tidy/Tokenizer.pm
@@ -21,7 +21,7 @@
 package Perl::Tidy::Tokenizer;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 use Perl::Tidy::LineBuffer;
 
@@ -6193,7 +6193,7 @@ sub scan_identifier_do {
                 # In something like '$${' we have type '$$' (and only
                 # part of an identifier)
                 && !( $identifier =~ /\$$/ && $tok eq '{' )
-                && ( $identifier  !~ /^(sub |package )$/ )
+                && ( $identifier !~ /^(sub |package )$/ )
               )
             {
                 $type = 'i';
diff --git a/lib/Perl/Tidy/VerticalAligner.pm b/lib/Perl/Tidy/VerticalAligner.pm
index c27e2eaf..8c231ac9 100644
--- a/lib/Perl/Tidy/VerticalAligner.pm
+++ b/lib/Perl/Tidy/VerticalAligner.pm
@@ -1,7 +1,7 @@
 package Perl::Tidy::VerticalAligner;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 use Perl::Tidy::VerticalAligner::Alignment;
 use Perl::Tidy::VerticalAligner::Line;
diff --git a/lib/Perl/Tidy/VerticalAligner/Alignment.pm b/lib/Perl/Tidy/VerticalAligner/Alignment.pm
index 2105deae..0adbf8df 100644
--- a/lib/Perl/Tidy/VerticalAligner/Alignment.pm
+++ b/lib/Perl/Tidy/VerticalAligner/Alignment.pm
@@ -7,7 +7,7 @@
 package Perl::Tidy::VerticalAligner::Alignment;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 {
 
diff --git a/lib/Perl/Tidy/VerticalAligner/Line.pm b/lib/Perl/Tidy/VerticalAligner/Line.pm
index b0e4a4d7..9cd6f23d 100644
--- a/lib/Perl/Tidy/VerticalAligner/Line.pm
+++ b/lib/Perl/Tidy/VerticalAligner/Line.pm
@@ -8,7 +8,7 @@
 package Perl::Tidy::VerticalAligner::Line;
 use strict;
 use warnings;
-our $VERSION = '20190915.01';
+our $VERSION = '20191207';
 
 {