From: Steve Hancock Date: Thu, 5 Nov 2020 15:30:46 +0000 (-0800) Subject: bump VERSION to .03 X-Git-Tag: 20201001.03~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b4662a909b722a887b6db0f51c88c90139bdc356;p=perltidy.git bump VERSION to .03 --- diff --git a/CHANGES.md b/CHANGES.md index 81de08fa..29b54ab9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,8 @@ # Perltidy Change Log -## 2020 10 01.02 +## 2020 10 01.03 + + - Fixed issue git #44, -vtc=n flag was ignored when -wn was set. - implement request RT #133649, delete-old-newlines selectively. Two parameters, diff --git a/bin/perltidy b/bin/perltidy index e8f304cb..3fc52778 100755 --- a/bin/perltidy +++ b/bin/perltidy @@ -483,7 +483,7 @@ This flag causes each B initial space characters to be replaced by one tab character. The value of the integer B can be any value but can be coordinated with the -number of spaces used for intentation. For example, -et=4 -ci=4 -i=4 will +number of spaces used for intentation. For example, B<-et=4 -ci=4 -i=4> will produce one tab for each indentation level and and one for each continuation indentation level. You may want to coordinate the value of B with what your display software assumes for the spacing of a tab. @@ -4445,7 +4445,7 @@ The perltidy binary uses the Perl::Tidy module and is installed when that module =head1 VERSION -This man page documents perltidy version 20201001.02 +This man page documents perltidy version 20201001.03 =head1 BUG REPORTS diff --git a/docs/BugLog.html b/docs/BugLog.html index ef159928..f8a14958 100644 --- a/docs/BugLog.html +++ b/docs/BugLog.html @@ -21,6 +21,12 @@
+
fix issue git #45, -wn and -vtc=n now work together
+
+ +

When -wn was set, the -vtc=n flag was being ignored. This was a simple fix made 5 Nov 2020 in 'fix issue git #45, -wn and -vtc=n now work together', 1fbc381.

+ +
implement request RT #133649, added parameters -kbb=s and -kba=s
diff --git a/docs/ChangeLog.html b/docs/ChangeLog.html index a4c59b15..cea52efe 100644 --- a/docs/ChangeLog.html +++ b/docs/ChangeLog.html @@ -1,8 +1,10 @@

Perltidy Change Log

-

2020 10 01.02

+

2020 10 01.03

-
- implement request RT #133649, delete-old-newlines selectively. Two parameters, 
+
- Fixed issue git #44, -vtc=n flag was ignored when -wn was set.
+
+- implement request RT #133649, delete-old-newlines selectively. Two parameters, 
 
   -kbb=s or --keep-old-breakpoints-before=s, and
   -kba=s or --keep-old-breakpoints-after=s
diff --git a/docs/Tidy.html b/docs/Tidy.html
index 7bc08fb7..cce2bf0d 100644
--- a/docs/Tidy.html
+++ b/docs/Tidy.html
@@ -372,7 +372,7 @@
 
 

VERSION

-

This man page documents Perl::Tidy version 20201001.02

+

This man page documents Perl::Tidy version 20201001.03

LICENSE

diff --git a/docs/perltidy.html b/docs/perltidy.html index fc9d6ddc..99f67b68 100644 --- a/docs/perltidy.html +++ b/docs/perltidy.html @@ -399,13 +399,15 @@
-et=n, --entab-leading-whitespace
-

This flag causes each n initial space characters to be replaced by one tab character. Note that the integer n is completely independent of the integer specified for indentation parameter, -i=n.

+

This flag causes each n initial space characters to be replaced by one tab character.

+ +

The value of the integer n can be any value but can be coordinated with the number of spaces used for intentation. For example, -et=4 -ci=4 -i=4 will produce one tab for each indentation level and and one for each continuation indentation level. You may want to coordinate the value of n with what your display software assumes for the spacing of a tab.

-t, --tabs
-

This flag causes one leading tab character to be inserted for each level of indentation. Certain other features are incompatible with this option, and if these options are also given, then a warning message will be issued and this flag will be unset. One example is the -lp option.

+

This flag causes one leading tab character to be inserted for each level of indentation. Certain other features are incompatible with this option, and if these options are also given, then a warning message will be issued and this flag will be unset. One example is the -lp option. This flag is retained for backwards compatability, but if you use tabs, the -et=n flag is recommended.

-dt=n, --default-tabsize=n
@@ -3430,7 +3432,7 @@

VERSION

-

This man page documents perltidy version 20201001.02

+

This man page documents perltidy version 20201001.03

BUG REPORTS

diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm index 2c891d4c..4bf538f0 100644 --- a/lib/Perl/Tidy.pm +++ b/lib/Perl/Tidy.pm @@ -107,7 +107,7 @@ BEGIN { # Release version must be bumped, and it is probably past time for a # release anyway. - $VERSION = '20201001.02'; + $VERSION = '20201001.03'; } sub DESTROY { diff --git a/lib/Perl/Tidy.pod b/lib/Perl/Tidy.pod index b4a27998..dd87a9e1 100644 --- a/lib/Perl/Tidy.pod +++ b/lib/Perl/Tidy.pod @@ -432,7 +432,7 @@ The module 'Perl::Tidy' comes with a binary 'perltidy' which is installed when t =head1 VERSION -This man page documents Perl::Tidy version 20201001.02 +This man page documents Perl::Tidy version 20201001.03 =head1 LICENSE diff --git a/lib/Perl/Tidy/Debugger.pm b/lib/Perl/Tidy/Debugger.pm index 007538f2..eb3ad933 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 = '20201001.02'; +our $VERSION = '20201001.03'; sub new { diff --git a/lib/Perl/Tidy/DevNull.pm b/lib/Perl/Tidy/DevNull.pm index c0bd13bf..6a416c19 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 = '20201001.02'; +our $VERSION = '20201001.03'; 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 7a39bcf8..57c1ceb7 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 = '20201001.02'; +our $VERSION = '20201001.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/FileWriter.pm b/lib/Perl/Tidy/FileWriter.pm index a56cb5a2..616c883f 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 = '20201001.02'; +our $VERSION = '20201001.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm index ff8a487b..55718379 100644 --- a/lib/Perl/Tidy/Formatter.pm +++ b/lib/Perl/Tidy/Formatter.pm @@ -49,7 +49,7 @@ use constant DEVEL_MODE => 0; { #<<< A non-indenting brace to contain all lexical variables use Carp; -our $VERSION = '20201001.02'; +our $VERSION = '20201001.03'; # The Tokenizer will be loaded with the Formatter ##use Perl::Tidy::Tokenizer; # for is_keyword() @@ -8324,7 +8324,7 @@ EOM ( $K_first, $K_last ) = @{$rK_range}; # remember original starting index in case it changes - my $K_first_true= $K_first; + my $K_first_true = $K_first; $rLL = $self->[_rLL_]; $radjusted_levels = $self->[_radjusted_levels_]; @@ -18984,9 +18984,9 @@ sub set_vertical_tightness_flags { my $cvt = $closing_vertical_tightness{$token_next}; if ( - # Never append a trailing line like ')->pack(' because it - # will throw off later alignment. So this line must start at a - # deeper level than the next line (fix1 for welding, git #45). + # Never append a trailing line like ')->pack(' because it + # will throw off later alignment. So this line must start at a + # deeper level than the next line (fix1 for welding, git #45). ( $nesting_depth_to_go[$ibeg_next] >= $nesting_depth_to_go[ $iend_next + 1 ] + 1 diff --git a/lib/Perl/Tidy/HtmlWriter.pm b/lib/Perl/Tidy/HtmlWriter.pm index d4471ca8..da6fb076 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 = '20201001.02'; +our $VERSION = '20201001.03'; use File::Basename; diff --git a/lib/Perl/Tidy/IOScalar.pm b/lib/Perl/Tidy/IOScalar.pm index 0da0c766..3cb64295 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 = '20201001.02'; +our $VERSION = '20201001.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/IOScalarArray.pm b/lib/Perl/Tidy/IOScalarArray.pm index d671b794..d4cee2d5 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 = '20201001.02'; +our $VERSION = '20201001.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/IndentationItem.pm b/lib/Perl/Tidy/IndentationItem.pm index b364e243..674bc162 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 = '20201001.02'; +our $VERSION = '20201001.03'; BEGIN { diff --git a/lib/Perl/Tidy/LineBuffer.pm b/lib/Perl/Tidy/LineBuffer.pm index 07d5d477..ac368115 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 = '20201001.02'; +our $VERSION = '20201001.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/LineSink.pm b/lib/Perl/Tidy/LineSink.pm index 81ea092a..bfec95b7 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 = '20201001.02'; +our $VERSION = '20201001.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/LineSource.pm b/lib/Perl/Tidy/LineSource.pm index 0886ee49..0ceb95b7 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 = '20201001.02'; +our $VERSION = '20201001.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/Logger.pm b/lib/Perl/Tidy/Logger.pm index 7653b9e0..fa85c378 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 = '20201001.02'; +our $VERSION = '20201001.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm index ab9803c5..ef46d5d8 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 = '20201001.02'; +our $VERSION = '20201001.03'; use Perl::Tidy::LineBuffer; use Carp; @@ -2846,7 +2846,7 @@ sub prepare_for_a_new_file { # Set a flag to indicate if we might be at an __END__ or __DATA__ line # This will be used below to avoid quoting a bare word followed by # a fat comma. - my $is_END_or_DATA; + my $is_END_or_DATA; # trim start of this line unless we are continuing a quoted line # do not trim end because we might end in a quote (test: deken4.pl) @@ -2858,7 +2858,6 @@ sub prepare_for_a_new_file { && $input_line =~ /^\s*__(END|DATA)__\s*$/; } - # update the copy of the line for use in error messages # This must be exactly what we give the pre_tokenizer $tokenizer_self->[_line_of_text_] = $input_line; diff --git a/lib/Perl/Tidy/VerticalAligner.pm b/lib/Perl/Tidy/VerticalAligner.pm index 0e5da7ff..1e7e8bf8 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 = '20201001.02'; +our $VERSION = '20201001.03'; 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 b11f226d..9ab45cf4 100644 --- a/lib/Perl/Tidy/VerticalAligner/Alignment.pm +++ b/lib/Perl/Tidy/VerticalAligner/Alignment.pm @@ -10,7 +10,7 @@ use warnings; { #<<< A non-indenting brace -our $VERSION = '20201001.02'; +our $VERSION = '20201001.03'; # _column_ # the current column number # _saved_column_ # a place for temporary storage diff --git a/lib/Perl/Tidy/VerticalAligner/Line.pm b/lib/Perl/Tidy/VerticalAligner/Line.pm index 2df91034..00242491 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 = '20201001.02'; +our $VERSION = '20201001.03'; BEGIN { my $i = 0;