diff options
| author | Karl Berry <karl@freefriends.org> | 2021-11-16 21:24:41 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-11-16 21:24:41 +0000 |
| commit | 0cc16768f4401ff12fa4ec4c983125ab6ba9e70a (patch) | |
| tree | ae2b01203a97fa235480072e8f8992d87ae8ae8b /Master/texmf-dist/scripts | |
| parent | 8596fbb0024154e107b3309d77164b9a1aca5087 (diff) | |
latexindent (16nov21)
git-svn-id: svn://tug.org/texlive/trunk@61075 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
4 files changed, 8 insertions, 5 deletions
diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm index 41a24db3875..113106e88ee 100644 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm @@ -64,9 +64,12 @@ sub yaml_read_settings{ # if latexindent.exe is invoked from TeXLive, then defaultSettings.yaml won't be in # the same directory as it; we need to navigate to it if(!$defaultSettings) { - $logger->info("Reading defaultSettings.yaml (2nd attempt, TeXLive, Windows) from $FindBin::RealBin/../../texmf-dist/scripts/latexindent/defaultSettings.yaml"); + $logger->info("Reading defaultSettings.yaml (2nd attempt) from $FindBin::RealBin/../../texmf-dist/scripts/latexindent/defaultSettings.yaml"); + $logger->info("and then, if necessary, $FindBin::RealBin/LatexIndent/defaultSettings.yaml"); if ( -e "$FindBin::RealBin/../../texmf-dist/scripts/latexindent/defaultSettings.yaml" ){ $defaultSettings = YAML::Tiny->read( "$FindBin::RealBin/../../texmf-dist/scripts/latexindent/defaultSettings.yaml"); + } elsif ( -e "$FindBin::RealBin/LatexIndent/defaultSettings.yaml" ) { + $defaultSettings = YAML::Tiny->read( "$FindBin::RealBin/LatexIndent/defaultSettings.yaml"); } else { $logger->fatal("*Could not open defaultSettings.yaml"); $self->output_logfile(); diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm index 1698d3a039f..4d320379f92 100644 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm @@ -19,6 +19,6 @@ use warnings; use Exporter qw/import/; our @EXPORT_OK = qw/$versionNumber $versionDate/; -our $versionNumber = '3.13.1'; -our $versionDate = '2021-11-12'; +our $versionNumber = '3.13.2'; +our $versionDate = '2021-11-15'; 1 diff --git a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml index a5aa0d90db4..e8d3858084c 100755 --- a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml +++ b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml @@ -1,4 +1,4 @@ -# defaultSettings.yaml for latexindent.pl, version 3.13.1, 2021-11-12 +# defaultSettings.yaml for latexindent.pl, version 3.13.2, 2021-11-15 # a script that aims to # beautify .tex, .sty, .cls files # diff --git a/Master/texmf-dist/scripts/latexindent/latexindent.pl b/Master/texmf-dist/scripts/latexindent/latexindent.pl index 7afb64eeebb..b02c2180ff2 100755 --- a/Master/texmf-dist/scripts/latexindent/latexindent.pl +++ b/Master/texmf-dist/scripts/latexindent/latexindent.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# latexindent.pl, version 3.13.1, 2021-11-12 +# latexindent.pl, version 3.13.2, 2021-11-15 # # 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 |