From 96b00a78469d97b34c7e89477725a37ab3fd32a1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Apr 2022 19:48:17 +0000 Subject: latexindent (14apr22) git-svn-id: svn://tug.org/texlive/trunk@63027 c570f23f-e606-0410-a88d-b1316a301751 --- .../linked_scripts/latexindent/latexindent.pl | 71 ++++++++++++---------- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 14 +++-- 2 files changed, 49 insertions(+), 36 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl b/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl index be2d51b6f43..f75b8165a5f 100755 --- a/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl +++ b/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# latexindent.pl, version 3.17.1, 2022-04-04 +# latexindent.pl, version 3.17.2, 2022-04-14 # # 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 @@ -19,40 +19,40 @@ use strict; use warnings; -use FindBin; # help find defaultSettings.yaml -use Getopt::Long; # to get the switches/options/flags +use FindBin; # help find defaultSettings.yaml +use Getopt::Long; # to get the switches/options/flags # use lib to make sure that @INC contains the latexindent directory use lib $FindBin::RealBin; use LatexIndent::Document; # get the options -my %switches = (readLocalSettings=>0); +my %switches = ( readLocalSettings => 0 ); -GetOptions ( - "version|v"=>\$switches{version}, - "vversion|vv"=>\$switches{vversion}, - "silent|s"=>\$switches{silentMode}, - "trace|t"=>\$switches{trace}, - "ttrace|tt"=>\$switches{ttrace}, - "local|l:s"=>\$switches{readLocalSettings}, - "yaml|y=s"=>\$switches{yaml}, - "onlydefault|d"=>\$switches{onlyDefault}, - "overwrite|w"=>\$switches{overwrite}, - "overwriteIfDifferent|wd"=>\$switches{overwriteIfDifferent}, - "outputfile|o=s"=>\$switches{outputToFile}, - "modifylinebreaks|m"=>\$switches{modifyLineBreaks}, - "logfile|g=s"=>\$switches{logFileName}, - "help|h"=>\$switches{showhelp}, - "cruft|c=s"=>\$switches{cruftDirectory}, - "screenlog|sl"=>\$switches{screenlog}, - "replacement|r"=>\$switches{replacement}, - "onlyreplacement|rr"=>\$switches{onlyreplacement}, - "replacementrespectverb|rv"=>\$switches{replacementRespectVerb}, - "check|k"=>\$switches{check}, - "checkv|kv"=>\$switches{checkverbose}, - "lines|n=s"=>\$switches{lines}, - "GCString"=>\$switches{GCString}, +GetOptions( + "version|v" => \$switches{version}, + "vversion|vv" => \$switches{vversion}, + "silent|s" => \$switches{silentMode}, + "trace|t" => \$switches{trace}, + "ttrace|tt" => \$switches{ttrace}, + "local|l:s" => \$switches{readLocalSettings}, + "yaml|y=s" => \$switches{yaml}, + "onlydefault|d" => \$switches{onlyDefault}, + "overwrite|w" => \$switches{overwrite}, + "overwriteIfDifferent|wd" => \$switches{overwriteIfDifferent}, + "outputfile|o=s" => \$switches{outputToFile}, + "modifylinebreaks|m" => \$switches{modifyLineBreaks}, + "logfile|g=s" => \$switches{logFileName}, + "help|h" => \$switches{showhelp}, + "cruft|c=s" => \$switches{cruftDirectory}, + "screenlog|sl" => \$switches{screenlog}, + "replacement|r" => \$switches{replacement}, + "onlyreplacement|rr" => \$switches{onlyreplacement}, + "replacementrespectverb|rv" => \$switches{replacementRespectVerb}, + "check|k" => \$switches{check}, + "checkv|kv" => \$switches{checkverbose}, + "lines|n=s" => \$switches{lines}, + "GCString" => \$switches{GCString}, ); # conditionally load the GCString module @@ -66,16 +66,23 @@ eval "use Unicode::GCString" if $switches{GCString}; # in which case, the GetOptions routine mistakes myfile.tex # as the optional parameter to the l flag. # -# In such circumstances, we correct the mistake by assuming that +# In such circumstances, we correct the mistake by assuming that # the only argument is the file to be indented, and place it in @ARGV -if($switches{readLocalSettings} and scalar(@ARGV) < 1) { - push(@ARGV,$switches{readLocalSettings}); +if ( $switches{readLocalSettings} and scalar(@ARGV) < 1 ) { + push( @ARGV, $switches{readLocalSettings} ); $switches{readLocalSettings} = ''; } # allow STDIN as input, if a filename is not present unshift( @ARGV, '-' ) unless @ARGV; -my $document = bless ({name=>"mainDocument",modifyLineBreaksYamlName=>"mainDocument",switches=>\%switches},"LatexIndent::Document"); +my $document = bless( + { + name => "mainDocument", + modifyLineBreaksYamlName => "mainDocument", + switches => \%switches + }, + "LatexIndent::Document" +); $document->latexindent( \@ARGV ); exit(0); diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 03e8b7e7269..0c4e48ee843 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 62899 2022-04-04 17:45:51Z karl $ +# $Id: tlmgr.pl 63018 2022-04-13 00:49:43Z karl $ # # Copyright 2008-2022 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -7,8 +7,8 @@ use strict; use warnings; -my $svnrev = '$Revision: 62899 $'; -my $datrev = '$Date: 2022-04-04 19:45:51 +0200 (Mon, 04 Apr 2022) $'; +my $svnrev = '$Revision: 63018 $'; +my $datrev = '$Date: 2022-04-13 02:49:43 +0200 (Wed, 13 Apr 2022) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -5614,6 +5614,7 @@ sub check_files { tlpkg/texlive.tlpdb tlpkg/tlpobj tlpkg/texlive.profile texmf-config/ texmf-var/ texmf.cnf texmfcnf.lua install-tl.log + tlmgr.log tlmgr-commands.log !; my %tltreefiles = %{$tltree->{'_allfiles'}}; my @tlpdbfiles = keys %filetopacks; @@ -9648,6 +9649,11 @@ just as in normal mode. In user mode, these actions operate only on the user tree's configuration files and/or C. +=head2 User mode logs + +In user mode, C and are written in the +C directlry instead of C. + =head1 MULTIPLE REPOSITORIES The main TeX Live repository contains a vast array of packages. @@ -10233,7 +10239,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 62899 2022-04-04 17:45:51Z karl $ +$Id: tlmgr.pl 63018 2022-04-13 00:49:43Z karl $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html -- cgit v1.2.3