diff options
author | Karl Berry <karl@freefriends.org> | 2022-10-30 20:55:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-10-30 20:55:11 +0000 |
commit | 61064bf719cf92ef51d33afec7d7527e5f090b5f (patch) | |
tree | f365d581237132a0da1fcb12d8b3256370b74000 /Master/texmf-dist/scripts/latexindent | |
parent | 6a866a6823f130092bc2190bc07bde90b20bae42 (diff) |
latexindent, I mean (30oct22)
git-svn-id: svn://tug.org/texlive/trunk@64874 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/latexindent')
4 files changed, 10 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm index 96577d28d0a..23f5a70d856 100644 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm @@ -67,6 +67,9 @@ sub yaml_read_settings { $logger->info("Reading defaultSettings.yaml from $FindBin::RealBin/defaultSettings.yaml"); my $myLibDir = dirname(__FILE__); + my ( $name, $dir, $ext ) = fileparse( $INC{"LatexIndent/GetYamlSettings.pm"}, "pm" ); + $dir =~ s/\/$//; + # 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 ) { @@ -81,6 +84,9 @@ sub yaml_read_settings { elsif ( -e "$FindBin::RealBin/LatexIndent/defaultSettings.yaml" ) { $defaultSettings = YAML::Tiny->read("$FindBin::RealBin/LatexIndent/defaultSettings.yaml"); } + elsif ( -e "$dir/defaultSettings.yaml" ) { + $defaultSettings = YAML::Tiny->read("$dir/defaultSettings.yaml"); + } elsif ( -e "$myLibDir/defaultSettings.yaml" ) { +$defaultSettings = YAML::Tiny->read("$myLibDir/defaultSettings.yaml"); } diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm index 5c9cd5c2ae1..04aaf11759d 100644 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm @@ -20,6 +20,6 @@ use warnings; use Exporter qw/import/; our @EXPORT_OK = qw/$versionNumber $versionDate/; -our $versionNumber = '3.18'; -our $versionDate = '2022-06-12'; +our $versionNumber = '3.19'; +our $versionDate = '2022-10-30'; 1 diff --git a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml index 5f10f499bf9..91f6fb9a70c 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.18, 2022-06-12 +# defaultSettings.yaml for latexindent.pl, version 3.19, 2022-10-30 # 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 49dbe7192ee..838b5ba3281 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.18, 2022-06-12 +# latexindent.pl, version 3.19, 2022-10-30 # # 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 |