diff options
Diffstat (limited to 'support/latexindent/LatexIndent')
-rw-r--r-- | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm | 4 | ||||
-rw-r--r-- | support/latexindent/LatexIndent/LogFile.pm | 14 | ||||
-rw-r--r-- | support/latexindent/LatexIndent/Switches.pm | 1 | ||||
-rw-r--r-- | support/latexindent/LatexIndent/Version.pm | 4 |
4 files changed, 19 insertions, 4 deletions
diff --git a/support/latexindent/LatexIndent/AlignmentAtAmpersand.pm b/support/latexindent/LatexIndent/AlignmentAtAmpersand.pm index 22de133bf1..8f67d62c58 100644 --- a/support/latexindent/LatexIndent/AlignmentAtAmpersand.pm +++ b/support/latexindent/LatexIndent/AlignmentAtAmpersand.pm @@ -899,7 +899,7 @@ sub multicolumn_pre_check { $j++; # multicolumn entry - if(${$cell}{type} =~ m/(\d)/) { + if(${$cell}{type} =~ m/(\d+)/) { my $multiColumnSpan = $1; @@ -1005,7 +1005,7 @@ sub multicolumn_padding{ $j++; # multicolumn entry - next unless (${$cell}{type} =~ m/(\d)/); + next unless (${$cell}{type} =~ m/(\d+)/); my $multiColumnSpan = $1; diff --git a/support/latexindent/LatexIndent/LogFile.pm b/support/latexindent/LatexIndent/LogFile.pm index e01792c6fb..692bfddbdb 100644 --- a/support/latexindent/LatexIndent/LogFile.pm +++ b/support/latexindent/LatexIndent/LogFile.pm @@ -28,6 +28,17 @@ sub process_switches{ # -v switch is just to show the version number if($switches{version}) { print $versionNumber,", ",$versionDate,"\n"; + if ($switches{vversion}) { + print "$FindBin::Script lives here: $FindBin::RealBin/$FindBin::Script\n"; + if ( -e "$FindBin::RealBin/defaultSettings.yaml" ){ + print "defaultSettings.yaml lives here $FindBin::RealBin/defaultSettings.yaml\n"; + } elsif ( -e "$FindBin::RealBin/../../texmf-dist/scripts/latexindent/defaultSettings.yaml" ){ + print "defaultSettings.yaml lives here $FindBin::RealBin/../../texmf-dist/scripts/latexindent/defaultSettings.yaml\n"; + } elsif ( -e "$FindBin::RealBin/LatexIndent/defaultSettings.yaml" ) { + print "defaultSettings.yaml lives here $FindBin::RealBin/LatexIndent/defaultSettings.yaml\n"; + } + print "project home: https://github.com/cmhughes/latexindent.pl\n"; + } exit(0); } @@ -37,6 +48,9 @@ latexindent.pl version $versionNumber, $versionDate usage: latexindent.pl [options] [file] -v, --version displays the version number and date of release + -vv, --vversion + displays verbose version details: the version number, date of release, + and location details of latexindent.pl and defaultSettings.yaml -h, --help help (see the documentation for detailed instructions and examples) -sl, --screenlog diff --git a/support/latexindent/LatexIndent/Switches.pm b/support/latexindent/LatexIndent/Switches.pm index 360ac41504..a57722782b 100644 --- a/support/latexindent/LatexIndent/Switches.pm +++ b/support/latexindent/LatexIndent/Switches.pm @@ -33,6 +33,7 @@ sub store_switches{ # copy document switches into hash local to this module %switches = %{${$self}{switches}}; + $switches{version} = defined $switches{vversion} ? 1 : $switches{version}; $is_m_switch_active = defined $switches{modifyLineBreaks}?$switches{modifyLineBreaks}: 0; $is_t_switch_active = defined $switches{trace}?$switches{trace}: 0; $is_tt_switch_active = defined $switches{ttrace}?$switches{ttrace}: 0; diff --git a/support/latexindent/LatexIndent/Version.pm b/support/latexindent/LatexIndent/Version.pm index 9b4198e6bf..8b3aadca2d 100644 --- a/support/latexindent/LatexIndent/Version.pm +++ b/support/latexindent/LatexIndent/Version.pm @@ -19,6 +19,6 @@ use warnings; use Exporter qw/import/; our @EXPORT_OK = qw/$versionNumber $versionDate/; -our $versionNumber = '3.13.5'; -our $versionDate = '2022-01-02'; +our $versionNumber = '3.14'; +our $versionDate = '2022-01-08'; 1 |