From: Steve Hancock Date: Sat, 28 May 2022 02:16:03 +0000 (-0700) Subject: update to preliminary v20220601 X-Git-Tag: 20220613~7 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e585335474c9680307ebaa0bae792451051bc4cd;p=perltidy.git update to preliminary v20220601 --- diff --git a/CHANGES.md b/CHANGES.md index b2eef0f0..2214c328 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Perltidy Change Log -## 2022 02 17.04 +## 2022 06 01 - The flag --encode-output-strings, or -eos, is now set on by default, as noted in the discussion of issue git #92. This has no effect on the use diff --git a/Makefile.PL b/Makefile.PL index 34eb0d4f..09b23bea 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,4 +1,23 @@ use ExtUtils::MakeMaker; + +my $mm_ver = $ExtUtils::MakeMaker::VERSION; +if ( $mm_ver =~ /_/ ) { # developer release/version + $mm_ver = eval $mm_ver; + die $@ if $@; +} + +# Minimum version found by perlver: +# +# ------------------------------------------ +# | file | explicit | syntax | external | +# | ------------------------------------------ | +# | perltidy.pl | v5.8.0 | v5.8.0 | n/a | +# | ------------------------------------------ | +# | Minimum explicit version : v5.8.0 | +# | Minimum syntax version : v5.8.0 | +# | Minimum version of perl : v5.8.0 | +# ------------------------------------------ + WriteMakefile( NAME => "Perl::Tidy", VERSION_FROM => "lib/Perl/Tidy.pm", @@ -11,6 +30,10 @@ WriteMakefile( ) : () ), + ( + $mm_ver >= 6.48 ? ( MIN_PERL_VERSION => 5.008 ) + : () + ), EXE_FILES => ['bin/perltidy'], dist => { COMPRESS => 'gzip', SUFFIX => 'gz' }, diff --git a/bin/perltidy b/bin/perltidy index 62a7c629..5b7f1e7a 100755 --- a/bin/perltidy +++ b/bin/perltidy @@ -5163,7 +5163,7 @@ The perltidy binary uses the Perl::Tidy module and is installed when that module =head1 VERSION -This man page documents perltidy version 20220217.04 +This man page documents perltidy version 20220601 =head1 BUG REPORTS diff --git a/docs/ChangeLog.html b/docs/ChangeLog.html index 41581cc0..c458f530 100644 --- a/docs/ChangeLog.html +++ b/docs/ChangeLog.html @@ -1,5 +1,47 @@

Perltidy Change Log

+

2022 06 01

+ +
- The flag --encode-output-strings, or -eos, is now set on by default, as
+  noted in the discussion of issue git #92.  This has no effect on the use
+  of the 'perltidy' binary but could change the behavior of programs which
+  use the Perl::Tidy module on files encoded in UTF-8.  If any problems are
+  noticed, an emergency fix can be made by reverting to the old default with
+  the flag -neos.  For complete details see:
+
+       https://github.com/perltidy/perltidy/blob/master/docs/eos_flag.md
+
+- Add vertical alignment for qw quotes in 'use' statements (see issue #git 93).
+  This is on by default but can be turned off with -vxl='q':
+
+    # old default or -vxl='q'
+    use Getopt::Long qw(GetOptions);
+    use Fcntl qw(O_RDONLY O_WRONLY O_EXCL O_CREAT);
+    use Symbol qw(gensym);
+    use Exporter ();
+
+    # new default
+    use Getopt::Long qw(GetOptions);
+    use Fcntl        qw(O_RDONLY O_WRONLY O_EXCL O_CREAT);
+    use Symbol       qw(gensym);
+    use Exporter     ();
+
+- Previously, if a -dsc command was used to delete all side comments,
+  then any special control comments for non-indenting braces got deleted too.
+  Now, these control side comments are retained when -dsc is set unless
+  a -nnib flag is also set to deactivate them.
+
+- This version runs 15 to 20 percent faster on large files than the
+  previous release due to optimizations made with the help of Devel::NYTProf.
+
+- This version of perltidy was stress-tested for many cpu hours with
+  random input parameters. No failures to converge, internal fault checks,
+  undefined variable references or other irregularities were seen.
+
+- Fixed and reactivated two failing installation tests (they were reading
+  a local .perltidyrc file)
+
+

2022 02 17

- A new flag, --encode-output-strings, or -eos, has been added to resolve
diff --git a/docs/Tidy.html b/docs/Tidy.html
index 3b47e6c4..96e326f8 100644
--- a/docs/Tidy.html
+++ b/docs/Tidy.html
@@ -61,7 +61,7 @@
 
    use Perl::Tidy;
     Perl::Tidy::perltidy();

 
-
The call to perltidy returns a scalar $error_flag which is TRUE if an error caused premature termination, and FALSE if the process ran to normal completion. Additional discuss of errors is contained below in the "ERROR HANDLING" section.

+
The call to perltidy returns a scalar $error_flag which is TRUE if an error caused premature termination, and FALSE if the process ran to normal completion. Additional discuss of errors is contained below in the ERROR HANDLING section.

 
 
The module accepts input and output streams by a variety of methods. The following list of parameters may be any of the following: a filename, an ARRAY reference, a SCALAR reference, or an object with either a getline or print method, as appropriate.

 
@@ -101,36 +101,34 @@
 
 
If the destination parameter is given, it will be used to define the file or memory location to receive output of perltidy.

 
-
Important note if destination is a string or array reference. Perl strings of characters which are decoded as utf8 by Perl::Tidy can be returned in either of two possible states, decoded or encoded, and it is important that the calling program and Perl::Tidy are in agreement regarding the state to be returned. A flag --encode-output-strings, or simply -eos, was added in versions of Perl::Tidy after 20220101 for this purpose. This flag should be added to the end of the argv paremeter (described below) if Perl::Tidy will be decoding utf8 text. The options are as follows.

+
Important note if destination is a string or array reference. Perl strings of characters which are decoded as utf8 by Perl::Tidy can be returned in either of two possible states, decoded or encoded, and it is important that the calling program and Perl::Tidy are in agreement regarding the state to be returned. A flag --encode-output-strings, or simply -eos, was added in Perl::Tidy version 20220217 for this purpose.

 
 
    
 
-
  • Use -eos if Perl::Tidy should encode any string which it decodes. This is probably most convenient for most programs. But do not use this setting if the calling program will encode the data too, because double encoding will corrupt data.
    
+
  • Use -eos if Perl::Tidy should encode any string which it decodes. This is the current default because it makes perltidy behave well as a filter, and is the correct setting for most programs. But do not use this setting if the calling program will encode the data too, because double encoding will corrupt data.
    
 
 
    • 
-
  • Use -neos if a string should remain decoded if it was decoded by Perl::Tidy. This is appropriate if the calling program will handle any needed encoding before outputting the string.
    
-
-
    • 
-
  • The current default is -neos, but the default could change in a future version, so -neos should still be set, if appropriate, to allow for the possibility of a future change in the default.
    
+
  • Use -neos if a string should remain decoded if it was decoded by Perl::Tidy. This is only appropriate if the calling program will handle any needed encoding before outputting the string. If needed, this flag can be added to the end of the argv parameter passed to Perl::Tidy.
    
 
 
    • 
 

 
-
For example, to set -eos the following could be used

+
For some background information see https://github.com/perltidy/perltidy/blob/master/docs/eos_flag.md.

 
-
        $argv .= " -eos" if ( $Perl::Tidy::VERSION > 20220101 );
+
This change in default behavior was made over a period of time as follows:

 
-        $error_flag = Perl::Tidy::perltidy(
-            argv        => $argv,
-            source      => \$source,
-            destination => \$destination,
-            stderr      => \$stderr,
-            errorfile   => \$errorfile
-        );

+
 
 
 
stderr

@@ -403,7 +401,7 @@
 
 
VERSION

 
-
This man page documents Perl::Tidy version 20220217

+
This man page documents Perl::Tidy version 20220601

 
 
LICENSE

 
diff --git a/docs/perltidy.html b/docs/perltidy.html
index dd438289..085b9cd4 100644
--- a/docs/perltidy.html
+++ b/docs/perltidy.html
@@ -328,7 +328,7 @@
 
 
        perltidy -sal='method fun _sub M4'

 
-
will cause the perltidy to treate the words 'method', 'fun', '_sub' and 'M4' to be treated the same as if they were 'sub'. Note that if the alias words are separated by spaces then the string of words should be placed in quotes.

+
will cause the perltidy to treat the words 'method', 'fun', '_sub' and 'M4' the same as if they were 'sub'. Note that if the alias words are separated by spaces then the string of words should be placed in quotes.

 
 
Note that several other parameters accept a list of keywords, including 'sub' (see "Specifying Block Types"). You do not need to include any sub aliases in these lists. Just include keyword 'sub' if you wish, and all aliases are automatically included.

 
@@ -336,7 +336,7 @@
 
-gal=s, --grep-alias-list=s

 

 
-
This flag allows a code block following an external 'list operator' function to be formatted as if it followed one of the builtin keywords grep, map or sort. The string s contains the names of one or more such list operators, separated by spaces or commas.

+
This flag allows a code block following an external 'list operator' function to be formatted as if it followed one of the built-in keywords grep, map or sort. The string s contains the names of one or more such list operators, separated by spaces or commas.

 
 
By 'list operator' is meant a function which is invoked in the form

 
@@ -431,15 +431,15 @@
 
-et=n, --entab-leading-whitespace

 

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

+
This flag causes each n leading space characters produced by the formatting process to be replaced by one tab character. The formatting process itself works with space characters. The -et=n parameter is applied as a last step, after formatting is complete, to convert leading spaces into tabs. Before starting to use tabs, it is essential to first get the indentation controls set as desired without tabs, particularly the two parameters --indent-columns=n (or -i=n) and --continuation-indentation=n (or -ci=n).

 
-
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.

+
The value of the integer n can be any value but can be coordinated with the number of spaces used for indentation. 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 is retained for backwards compatibility, but if you use tabs, the -et=n flag is recommended.

+
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 compatibility, but if you use tabs, the -et=n flag is recommended. If both -t and -et=n are set, the -et=n is used.

 
 

 
-dt=n, --default-tabsize=n

@@ -488,7 +488,7 @@
 
-enc=s, --character-encoding=s

 

 
-
This flag indicates if the input data stream use a character encoding. Perltidy does not look for the encoding directives in the soure stream, such as use utf8, and instead relies on this flag to determine the encoding. (Note that perltidy often works on snippets of code rather than complete files so it cannot rely on use utf8 directives).

+
This flag indicates if the input data stream use a character encoding. Perltidy does not look for the encoding directives in the source stream, such as use utf8, and instead relies on this flag to determine the encoding. (Note that perltidy often works on snippets of code rather than complete files so it cannot rely on use utf8 directives).

 
 
The possible values for s are:

 
@@ -524,13 +524,21 @@
 
-eos=s, --encode-output-strings=s

 

 
-
This flag has been added to resolve an issue involving the interface between Perl::Tidy and calling programs, and in particular Code::TidyAll (tidyall). By default Perl::Tidy returns unencoded strings to the calling program, but some programs expect encoded strings. Setting this flag causes Perl::Tidy to return encoded output strings which it decoded. For some background information see https://github.com/perltidy/perltidy/issues/83 and https://github.com/houseabsolute/perl-code-tidyall/issues/84.

+
This flag was added to resolve an issue involving the interface between Perl::Tidy and calling programs, and in particular Code::TidyAll (tidyall).

 
-
If you only run the perltidy binary this flag has no effect.

+
If you only run the perltidy binary this flag has no effect. If you run a program which calls the Perl::Tidy module and receives a string in return, then the meaning of the flag is as follows:

 
-
If you use tidyall with encoded files and encounter irregularities such as wide character messages you should set this flag.

+
    
+
+
  • The setting -eos means Perl::Tidy should encode any string which it decodes. This is the default because it makes perltidy behave well as a filter, and is the correct setting for most programs.
    
 
-
    Additional information can be found in the man pages for the Perl::Tidy module.
    
+
    • 
+
  • The setting -neos means that a string should remain decoded if it was decoded by Perl::Tidy. This is only appropriate if the calling program will handle any needed encoding before outputting the string.
    
+
+
    • 
+

+
+
The default was changed from -neos to -eos in versions after 20220217. If this change causes a program to start running incorrectly on encoded files, an emergency fix might be to set -neos. Additional information can be found in the man pages for the Perl::Tidy module and also in https://github.com/perltidy/perltidy/blob/master/docs/eos_flag.md.

 
 

 
-gcs, --use-unicode-gcstring

@@ -644,7 +652,7 @@
 
 
By default, perltidy examines the input file and tries to determine the starting indentation level. While it is often zero, it may not be zero for a code snippet being sent from an editing session.

 
-
To guess the starting indentation level perltidy simply assumes that indentation scheme used to create the code snippet is the same as is being used for the current perltidy process. This is the only sensible guess that can be made. It should be correct if this is true, but otherwise it probably won't. For example, if the input script was written with -i=2 and the current peltidy flags have -i=4, the wrong initial indentation will be guessed for a code snippet which has non-zero initial indentation. Likewise, if an entabbing scheme is used in the input script and not in the current process then the guessed indentation will be wrong.

+
To guess the starting indentation level perltidy simply assumes that indentation scheme used to create the code snippet is the same as is being used for the current perltidy process. This is the only sensible guess that can be made. It should be correct if this is true, but otherwise it probably won't. For example, if the input script was written with -i=2 and the current perltidy flags have -i=4, the wrong initial indentation will be guessed for a code snippet which has non-zero initial indentation. Likewise, if an entabbing scheme is used in the input script and not in the current process then the guessed indentation will be wrong.

 
 
If the default method does not work correctly, or you want to change the starting level, use -sil=n, to force the starting level to be n.

 
@@ -674,7 +682,7 @@
 
 
These flags have no effect on code BLOCKS, such as if/then/else blocks, which always use whatever is specified with -i=n.

 
-
Some limitiations on these flags are:

+
Some limitations on these flags are:

 
 
    
 
@@ -728,13 +736,13 @@
 
 
    Only one of these two flags may be used. Both flags can achieve the same result, but the -lpil=s flag is much easier to describe and use and is recommended. The -lpxl=s flag was the original implementation and is only retained for backwards compatibility.
    
 
-
    This list s for these parametes is a string with space-separated items. Each item consists of up to three pieces of information in this order: (1) an optional letter code (2) a required container type, and (3) an optional numeric code.
    
+
    This list s for these parameters is a string with space-separated items. Each item consists of up to three pieces of information in this order: (1) an optional letter code (2) a required container type, and (3) an optional numeric code.
    
 
 
    The only required piece of information is a container type, which is one of '(', '[', or '{'. For example the string
    
 
 
      -lpil='('
    
 
-
    means use -lp formatting only on lists within parentheses, not lists in square-bracets or braces. The same thing could alternatively be specified with
    
+
    means use -lp formatting only on lists within parentheses, not lists in square-brackets or braces. The same thing could alternatively be specified with
    
 
 
      -lpxl = '[ {'
    
 
@@ -742,7 +750,7 @@
 
 
    A second optional item of information which can be given for parentheses is an alphanumeric letter which is used to limit the selection further depending on the type of token immediately before the paren. The possible letters are currently 'k', 'K', 'f', 'F', 'w', and 'W', with these meanings for matching whatever precedes an opening paren:
    
 
-
     'k' matches if the previous nonblank token is a perl builtin keyword (such as 'if', 'while'),
+
     'k' matches if the previous nonblank token is a perl built-in keyword (such as 'if', 'while'),
  'K' matches if 'k' does not, meaning that the previous token is not a keyword.
  'f' matches if the previous token is a function other than a keyword.
  'F' matches if 'f' does not.
@@ -1121,7 +1129,7 @@
 
      # perltidy -nwrs='+', syntax error:
   for my $severity ( reverse $SEVERITY_LOWEST +1 .. $SEVERITY_HIGHEST ) { ... }
    
 
-
    To avoid subtle parsing problems like this, it is best to avoid spacing a binary operator asymetrically with a space on the left but not on the right.
    
+
    To avoid subtle parsing problems like this, it is best to avoid spacing a binary operator asymmetrically with a space on the left but not on the right.
    
 
 
 
    Space between specific keywords and opening paren
    
@@ -2257,7 +2265,7 @@
 
 
    A third optional item of information which can be given is an alphanumeric letter which is used to limit the selection further depending on the type of token immediately before the container. If given, it goes just before the container symbol. The possible letters are currently 'k', 'K', 'f', 'F', 'w', and 'W', with these meanings:
    
 
-
     'k' matches if the previous nonblank token is a perl builtin keyword (such as 'if', 'while'),
+
     'k' matches if the previous nonblank token is a perl built-in keyword (such as 'if', 'while'),
  'K' matches if 'k' does not, meaning that the previous token is not a keyword.
  'f' matches if the previous token is a function other than a keyword.
  'F' matches if 'f' does not.
@@ -2599,9 +2607,9 @@
 
    bal=n, --break-after-labels=n
    
 
    
 
-
    This flag controls whether or not a line break occurs after a label. There are three possible valuse for n:
    
+
    This flag controls whether or not a line break occurs after a label. There are three possible values for n:
    
 
-
      -bal=0  break if there is a break in the input [DEFAULt]
+
      -bal=0  break if there is a break in the input [DEFAULT]
   -bal=1  always break after a label
   -bal=2  never break after a label
    
 
@@ -2875,7 +2883,7 @@
 
 
    It is possible to be more specific in matching parentheses by preceding them with a letter. The possible letters are 'k', 'K', 'f', 'F', 'w', and 'W', with these meanings (these are the same as used in the --weld-nested-exclusion-list and --line-up-parentheses-exclusion-list parameters):
    
 
-
     'k' matches if the previous nonblank token is a perl builtin keyword (such as 'if', 'while'),
+
     'k' matches if the previous nonblank token is a perl built-in keyword (such as 'if', 'while'),
  'K' matches if 'k' does not, meaning that the previous token is not a keyword.
  'f' matches if the previous token is a function other than a keyword.
  'F' matches if 'f' does not.
@@ -3182,7 +3190,7 @@
 
 
    -kgbi or --keyword-group-blanks-inside controls the insertion of blank lines between the first and last statement of the entire group. If there is a continuous run of a single statement type with more than the minimum threshold number (as specified with -kgbs=s) then this switch causes a blank line be inserted between this subgroup and the others. In the example above this happened between the use and my statements.
    
 
-
    -kgbd or --keyword-group-blanks-delete controls the deletion of any blank lines that exist in the the group when it is first scanned. When statements are initially scanned, any existing blank lines are included in the collection. Any such orignial blank lines will be deleted before any other insertions are made when the parameter -kgbd is set. The default is not to do this, -nkgbd.
    
+
    -kgbd or --keyword-group-blanks-delete controls the deletion of any blank lines that exist in the the group when it is first scanned. When statements are initially scanned, any existing blank lines are included in the collection. Any such original blank lines will be deleted before any other insertions are made when the parameter -kgbd is set. The default is not to do this, -nkgbd.
    
 
 
    -kgbr=n or --keyword-group-blanks-repeat-count=n specifies n, the maximum number of times this logic will be applied to any file. The special value n=0 is the same as n=infinity which means it will be applied to an entire script [Default]. A value n=1 could be used to make it apply just one time for example. This might be useful for adjusting just the use statements in the top part of a module for example.
    
 
@@ -3403,7 +3411,7 @@
 
    Completely turning off vertical alignment with -novalign
    
 
    
 
-
    The default is to use vertical alignment, but bertical alignment can be completely turned of with the -novalign flag.
    
+
    The default is to use vertical alignment, but vertical alignment can be completely turned of with the -novalign flag.
    
 
 
    A lower level of control of vertical alignment is possible with three parameters -vc, -vsc, and -vbc. These independently control alignment of code, side comments and block comments. They are described in the next section.
    
 
@@ -3419,7 +3427,7 @@
 
    Controlling side comment alignment with --valign-side-comments or -vsc
    
 
    
 
-
    The -vsc flag enables alignment of side comments and is enabled by default. If side comment aligment is disabled with -nvsc they will appear at a fixed space from the preceding code token. The default is -vsc
    
+
    The -vsc flag enables alignment of side comments and is enabled by default. If side comment alignment is disabled with -nvsc they will appear at a fixed space from the preceding code token. The default is -vsc
    
 
 
    
 
    Controlling block comment alignment with --valign-block-comments or -vbc
    
@@ -3434,14 +3442,16 @@
 
    More detailed control of alignment types is available with these two parameters. Most of the vertical alignments in typical programs occur at one of the tokens ',', '=', and '=>', but many other alignments are possible and are given in the following list:
    
 
 
      = **= += *= &= <<= &&= -= /= |= >>= ||= //= .= %= ^= x=
-  { ( ? : , ; => && || ~~ !~~ =~ !~ // <=> ->
+  { ( ? : , ; => && || ~~ !~~ =~ !~ // <=> -> q
   if unless and or err for foreach while until
    
 
-
    These alignments are all enabled by default, but they can be selectively disabled by including one or more of these tokens in the space-separated list valign-exclusion-list=s. For example, the following would prevent alignment at = and if:
    
+
    These alignment types correspond to perl symbols, operators and keywords except for 'q', which refers to the special case of alignment in a 'use' statement of qw quotes and empty parens.
    
+
+
    They are all enabled by default, but they can be selectively disabled by including one or more of these tokens in the space-separated list valign-exclusion-list=s. For example, the following would prevent alignment at = and if:
    
 
 
      --valign-exclusion-list='= if'
    
 
-
    If it is simpler to specify only the token types which are to be aligned, then include the types which are to be aligned in the list of --valign-inclusion-list. You may leave the valign-exclusion-list undefined, or use the special symbol * for the exclusion list. For example, the following parameters enable alignment only at commas and 'fat commas':
    
+
    If it is simpler to specify only the token types which are to be aligned, then include the types which are to be aligned in the list of --valign-inclusion-list. In that case you may leave the valign-exclusion-list undefined, or use the special symbol * for the exclusion list. For example, the following parameters enable alignment only at commas and 'fat commas':
    
 
 
      --valign-inclusion-list=', =>'
   --valign-exclusion-list='*'     ( this is optional and may be omitted )
    
@@ -3494,6 +3504,8 @@
 
 
    Two commands which remove comments (but not pod) are: -dbc or --delete-block-comments and -dsc or --delete-side-comments. (Hanging side comments will be deleted with side comments here.)
    
 
+
    When side comments are deleted, any special control side comments for non-indenting braces will be retained unless they are deactivated with a -nnib flag.
    
+
 
    The negatives of these commands also work, and are the defaults. When block comments are deleted, any leading 'hash-bang' will be retained. Also, if the -x flag is used, any system commands before a leading hash-bang will be retained (even if they are in the form of comments).
    
 
 
    
@@ -3518,7 +3530,7 @@
 
 
    These other locations are system-dependent, and may be displayed with the command perltidy -dpro. Under Unix systems, it will first look for an environment variable PERLTIDY. Then it will look for a .perltidyrc file in the home directory, and then for a system-wide file /usr/local/etc/perltidyrc, and then it will look for /etc/perltidyrc. Note that these last two system-wide files do not have a leading dot. Further system-dependent information will be found in the INSTALL file distributed with perltidy.
    
 
-
    Under Windows, perltidy will also search for a configuration file named perltidy.ini since Windows does not allow files with a leading period (.). Use perltidy -dpro to see the possible locations for your system. An example might be C:\Documents and Settings\All Users\perltidy.ini.
    
+
    Under Windows, perltidy will also search for a configuration file named perltidy.ini since Windows does not allow files with a leading period (.). Use perltidy -dpro to see the possible locations for your system. An example might be C:\Documents and Settings\All Users\perltidy.ini.
    
 
 
    Another option is the use of the PERLTIDY environment variable. The method for setting environment variables depends upon the version of Windows that you are using. Instructions for Windows 95 and later versions can be found here:
    
 
@@ -3991,7 +4003,7 @@
 
 
    VERSION
    
 
-
    This man page documents perltidy version 20220217
    
+
    This man page documents perltidy version 20220601
    
 
 
    BUG REPORTS
    
 
diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm
index d6b31ad4..4418ede6 100644
--- a/lib/Perl/Tidy.pm
+++ b/lib/Perl/Tidy.pm
@@ -113,7 +113,7 @@ BEGIN {
     # Release version must be bumped, and it is probably past time for a
     # release anyway.
 
-    $VERSION = '20220217.04';
+    $VERSION = '20220601';
 }
 
 sub DESTROY {
diff --git a/lib/Perl/Tidy.pod b/lib/Perl/Tidy.pod
index 06e7d83e..1057cd8f 100644
--- a/lib/Perl/Tidy.pod
+++ b/lib/Perl/Tidy.pod
@@ -480,7 +480,7 @@ The module 'Perl::Tidy' comes with a binary 'perltidy' which is installed when t
 
 =head1 VERSION
 
-This man page documents Perl::Tidy version 20220217.04
+This man page documents Perl::Tidy version 20220601
 
 =head1 LICENSE
 
diff --git a/lib/Perl/Tidy/Debugger.pm b/lib/Perl/Tidy/Debugger.pm
index 3c4e068a..a9150cb2 100644
--- a/lib/Perl/Tidy/Debugger.pm
+++ b/lib/Perl/Tidy/Debugger.pm
@@ -8,7 +8,7 @@ package Perl::Tidy::Debugger;
 use strict;
 use warnings;
 use English qw( -no_match_vars );
-our $VERSION = '20220217.04';
+our $VERSION = '20220601';
 
 use constant EMPTY_STRING => q{};
 use constant SPACE        => q{ };
diff --git a/lib/Perl/Tidy/DevNull.pm b/lib/Perl/Tidy/DevNull.pm
index b58c07e8..46ae3ba3 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 = '20220217.04';
+our $VERSION = '20220601';
 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 fe40873e..74765372 100644
--- a/lib/Perl/Tidy/Diagnostics.pm
+++ b/lib/Perl/Tidy/Diagnostics.pm
@@ -21,7 +21,7 @@ package Perl::Tidy::Diagnostics;
 use strict;
 use warnings;
 use English qw( -no_match_vars );
-our $VERSION = '20220217.04';
+our $VERSION = '20220601';
 
 use constant EMPTY_STRING => q{};
 
diff --git a/lib/Perl/Tidy/FileWriter.pm b/lib/Perl/Tidy/FileWriter.pm
index 9e497f62..1c351bce 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 = '20220217.04';
+our $VERSION = '20220601';
 
 use constant DEVEL_MODE   => 0;
 use constant EMPTY_STRING => q{};
diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index 11adf2a6..5933fd19 100644
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -52,7 +52,7 @@ use constant SPACE        => q{ };
 
 use Carp;
 use English qw( -no_match_vars );
-our $VERSION = '20220217.04';
+our $VERSION = '20220601';
 
 # The Tokenizer will be loaded with the Formatter
 ##use Perl::Tidy::Tokenizer;    # for is_keyword()
diff --git a/lib/Perl/Tidy/HtmlWriter.pm b/lib/Perl/Tidy/HtmlWriter.pm
index b4827d3d..b63e0dd2 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 = '20220217.04';
+our $VERSION = '20220601';
 
 use English qw( -no_match_vars );
 use File::Basename;
diff --git a/lib/Perl/Tidy/IOScalar.pm b/lib/Perl/Tidy/IOScalar.pm
index 90b16f04..d2d2d3ba 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 = '20220217.04';
+our $VERSION = '20220601';
 
 use constant EMPTY_STRING => q{};
 
diff --git a/lib/Perl/Tidy/IOScalarArray.pm b/lib/Perl/Tidy/IOScalarArray.pm
index 8a1c7dff..59c45ec5 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 = '20220217.04';
+our $VERSION = '20220601';
 
 sub AUTOLOAD {
 
diff --git a/lib/Perl/Tidy/IndentationItem.pm b/lib/Perl/Tidy/IndentationItem.pm
index 0e7364c1..6f091590 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 = '20220217.04';
+our $VERSION = '20220601';
 
 BEGIN {
 
diff --git a/lib/Perl/Tidy/LineBuffer.pm b/lib/Perl/Tidy/LineBuffer.pm
index 6b63165d..773492c5 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 = '20220217.04';
+our $VERSION = '20220601';
 
 sub AUTOLOAD {
 
diff --git a/lib/Perl/Tidy/LineSink.pm b/lib/Perl/Tidy/LineSink.pm
index 7d6a576b..780573f0 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 = '20220217.04';
+our $VERSION = '20220601';
 
 sub AUTOLOAD {
 
diff --git a/lib/Perl/Tidy/LineSource.pm b/lib/Perl/Tidy/LineSource.pm
index f0001fab..a8105891 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 = '20220217.04';
+our $VERSION = '20220601';
 
 sub AUTOLOAD {
 
diff --git a/lib/Perl/Tidy/Logger.pm b/lib/Perl/Tidy/Logger.pm
index 2830b833..bdd5aaac 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 = '20220217.04';
+our $VERSION = '20220601';
 use English qw( -no_match_vars );
 
 use constant EMPTY_STRING => q{};
diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm
index 91cc25c5..95f88255 100644
--- a/lib/Perl/Tidy/Tokenizer.pm
+++ b/lib/Perl/Tidy/Tokenizer.pm
@@ -23,7 +23,7 @@ use strict;
 use warnings;
 use English qw( -no_match_vars );
 
-our $VERSION = '20220217.04';
+our $VERSION = '20220601';
 
 use constant DEVEL_MODE   => 0;
 use constant EMPTY_STRING => q{};
diff --git a/lib/Perl/Tidy/VerticalAligner.pm b/lib/Perl/Tidy/VerticalAligner.pm
index 29a8530b..1b87384c 100644
--- a/lib/Perl/Tidy/VerticalAligner.pm
+++ b/lib/Perl/Tidy/VerticalAligner.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Carp;
 use English qw( -no_match_vars );
-our $VERSION = '20220217.04';
+our $VERSION = '20220601';
 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 8bf14c18..5ecfa1c6 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 = '20220217.04';
+our $VERSION = '20220601';
 
 BEGIN {
 
diff --git a/lib/Perl/Tidy/VerticalAligner/Line.pm b/lib/Perl/Tidy/VerticalAligner/Line.pm
index b0e471a6..0b5063bc 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 = '20220217.04';
+our $VERSION = '20220601';
 
 BEGIN {
 
diff --git a/local-docs/Release-Checklist.md b/local-docs/Release-Checklist.md
index d1aceb26..80c18b46 100644
--- a/local-docs/Release-Checklist.md
+++ b/local-docs/Release-Checklist.md
@@ -51,6 +51,7 @@
 - *IMPORTANT:* Now untar the file (perhaps in /tmp) and take a look at the
   contents.  Be sure it does not have unwanted files.
    - If necessary, remove MANIFEST, fix MANIFEST.SKIP and run make manifest again
+- run 'cpants-lint.pl' on the .tar.gz and check results
 - Do test installs on several systems 
 - Upload Release to CPAN
 - Update CPAN tickets