diff options
author | Karl Berry <karl@freefriends.org> | 2017-05-14 22:41:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-05-14 22:41:57 +0000 |
commit | f9f66e62105513200c759be6a8e3991f5a1a964a (patch) | |
tree | fefce8d070e20fc1ad5c2bece3804361ecd4d7e4 | |
parent | 4ebe0923247961f1c04ef98e3880128ceb705e3c (diff) |
latexindent (14may17)
git-svn-id: svn://tug.org/texlive/trunk@44354 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl | 2 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 97 | ||||
-rwxr-xr-x | Master/bin/win32/latexindent.exe | bin | 6282737 -> 6282983 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latexindent/README | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/latexindent/latexindent.pdf | bin | 525320 -> 524590 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latexindent/latexindent.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/scripts/latexindent/LatexIndent/FileContents.pm | 2 | ||||
-rw-r--r-- | Master/texmf-dist/scripts/latexindent/LatexIndent/LogFile.pm | 4 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/latexindent/latexindent.pl | 2 |
9 files changed, 66 insertions, 47 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl b/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl index 06adc58a1b8..7cfe4a98bbd 100755 --- a/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl +++ b/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl @@ -1,4 +1,6 @@ #!/usr/bin/env perl +# latexindent.pl, version 3.0.2, 2017-05-12 +# # 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 # the Free Software Foundation, either version 3 of the License, or diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 7f233bb6805..cb7d696a3f2 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 44289 2017-05-11 02:41:34Z preining $ +# $Id: tlmgr.pl 44325 2017-05-13 23:31:11Z karl $ # # Copyright 2008-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 44289 $'; -my $datrev = '$Date: 2017-05-11 04:41:34 +0200 (Thu, 11 May 2017) $'; +my $svnrev = '$Revision: 44325 $'; +my $datrev = '$Date: 2017-05-14 01:31:11 +0200 (Sun, 14 May 2017) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -7381,9 +7381,12 @@ category, short and long description, sizes, installation status, and TeX Live revision number. If I<pkg> is not locally installed, searches in the remote installation source. -For normal packages (not collections or schemes), the sizes of the -four groups of files (run/src/doc/bin files) are shown. For collections -and schemes the B<accumulated> size including depending packages. +For normal packages (not collections or schemes), the sizes of the four +groups of files (run/src/doc/bin files) are shown separately. For +collections, the cumulative size is shown, including all +directly-dependent packages (but not dependent collections). For +schemes, the cumulative size is also shown, including all +directly-dependent collections and packages. If I<pkg> is not found locally or remotely, the search action is used and lists matching packages and files. @@ -7577,7 +7580,8 @@ Its value is an integer. If the C<autobackup> value is C<-1>, no backups are removed. If C<autobackup> is 0 or more, it specifies the number of backups to keep. Thus, backups are disabled if the value is 0. In the C<--clean> mode of the C<backup> action this option also -specifies the number to be kept. +specifies the number to be kept. The default value is 1, so that +backups are made, but only one backup is kept. To setup C<autobackup> to C<-1> on the command line, use: @@ -7591,13 +7595,14 @@ The C<sys_bin>, C<sys_man>, and C<sys_info> options are used on Unix-like systems to control the generation of links for executables, info files and man pages. See the C<path> action for details. -The last three options control behavior on Windows installations. If -C<desktop_integration> is set, then some packages will install items in -a sub-folder of the Start menu for C<tlmgr gui>, documentation, etc. If -C<fileassocs> is set, Windows file associations are made (see also the -C<postaction> action). Finally, if C<multiuser> is set, then adaptions -to the registry and the menus are done for all users on the system -instead of only the current user. All three options are on by default. +The last three options also affect behavior on Windows installations. +If C<desktop_integration> is set, then some packages will install items +in a sub-folder of the Start menu for C<tlmgr gui>, documentation, etc. +If C<fileassocs> is set, Windows file associations are made (see also +the C<postaction> action). Finally, if C<multiuser> is set, then +adaptions to the registry and the menus are done for all users on the +system instead of only the current user. All three options are on by +default. =head2 paper @@ -7764,20 +7769,27 @@ package, dependencies are never removed. Options: =over 4 -=item B<--backup> and B<--backupdir> I<directory> +=item B<--backup> -These two options control the creation of backups of packages I<before> -removal; that is, backup of packages as currently installed. If -neither of these options are given, no backup package will be saved. If -C<--backupdir> is given and specifies a writable directory then a backup -will be made in that location. If only C<--backup> is given, then a -backup will be made to the directory previously set via the C<option> -action (see below). If both are given then a backup will be made to the -specified I<directory>. - -You can set options via the C<option> action to automatically create -backups for all packages, and/or keep only a certain number of -backups. Please see the C<option> action for details. +=item B<--backupdir> I<directory> + +These options behave just as with the L</update> action (q.v.), except +they apply to making backups of packages before they are removed. The +default is to make such a backup, that is, to save a copy of packages +before removal. + +See L</update> action for more. + +neither option is given, no backup will be made. If C<--backupdir> is +given and specifies a writable directory then a backup will be made in +that location. If only C<--backup> is given, then a backup will be made +to the directory previously set via the C<option> action (see below). If +both are given then a backup will be made to the specified I<directory>. + +You can set options via the C<option> action to automatically make +backups for all packages, and/or keep only a certain number of backups. +Please see the C<option> action for details. The default is to make one +backup. The C<restore> action explains how to restore from a backup. @@ -8130,28 +8142,29 @@ installation with the server's idea of what is available: tlmgr update --reinstall-forcibly-removed --all -=item B<--backup> and B<--backupdir> I<directory> +=item B<--backup> + +=item B<--backupdir> I<directory> These two options control the creation of backups of packages I<before> updating; that is, backup of packages as currently installed. If -neither of these options are given, no backup package will be saved. If -C<--backupdir> is given and specifies a writable directory then a backup -will be made in that location. If only C<--backup> is given, then a -backup will be made to the directory previously set via the C<option> -action (see below). If both are given then a backup will be made to the -specified I<directory>. +neither options is given, no backup will made saved. If C<--backupdir> +is given and specifies a writable directory then a backup will be made +in that location. If only C<--backup> is given, then a backup will be +made to the directory previously set via the L</option> action (see +below). If both are given then a backup will be made to the specified +I<directory>. -You can set options via the C<option> action to automatically create -backups for all packages, and/or keep only a certain number of -backups. Please see the C<option> action for details. +You can also set options via the C</option> action to automatically make +backups for all packages, and/or keep only a certain number of backups. C<tlmgr> always makes a temporary backup when updating packages, in case of download or other failure during an update. In contrast, the purpose -of this C<--backup> option is to allow you to save a persistent backup -in case the actual I<content> of the update causes problems, e.g., -introduces an incompatibility. +of this C<--backup> option is to save a persistent backup in case the +actual I<content> of the update causes problems, e.g., introduces an TeX +incompatibility. -The C<restore> action explains how to restore from a backup. +The L</restore> action explains how to restore from a backup. =item B<--no-depends> @@ -8864,7 +8877,7 @@ This script and its documentation were written for the TeX Live distribution (L<http://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 44289 2017-05-11 02:41:34Z preining $ +$Id: tlmgr.pl 44325 2017-05-13 23:31:11Z karl $ =cut # to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/bin/win32/latexindent.exe b/Master/bin/win32/latexindent.exe Binary files differindex a9b2f0c07ee..004a5bc7980 100755 --- a/Master/bin/win32/latexindent.exe +++ b/Master/bin/win32/latexindent.exe diff --git a/Master/texmf-dist/doc/support/latexindent/README b/Master/texmf-dist/doc/support/latexindent/README index 84048efae10..bc733d967fc 100644 --- a/Master/texmf-dist/doc/support/latexindent/README +++ b/Master/texmf-dist/doc/support/latexindent/README @@ -1,4 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + latexindent.pl, version 3.0.2, 2017-05-12 + PERL script to indent code within environments, and align delimited environments in .tex files. @@ -24,7 +26,7 @@ FOR COMPLETE DETAILS, PLEASE SEE documentation/latexindent.pdf Note: latexindent.exe was created using - pp -o latexindent.exe latexindent.pl + perl ppp.pl -u -o latexindent.exe latexindent.pl using the Par::Packer perl module. diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf Binary files differindex 03ca111bc3a..d9b467b658b 100644 --- a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf +++ b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent.tex b/Master/texmf-dist/doc/support/latexindent/latexindent.tex index 4a1a4163254..16a0a5c26ce 100644 --- a/Master/texmf-dist/doc/support/latexindent/latexindent.tex +++ b/Master/texmf-dist/doc/support/latexindent/latexindent.tex @@ -407,7 +407,7 @@ sharp corners, enhanced, overlay={\node[anchor=north east,outer sep=2pt] at ([xshift=3cm,yshift=4mm]frame.north east) {\includegraphics[width=3cm]{logo}}; }] - \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.0.1 + \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.0.2 \end{tcolorbox} } \author{Chris Hughes \thanks{and contributors! See \vref{sec:contributors}. For diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/FileContents.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/FileContents.pm index dc8aa53f206..a1b56391f2c 100644 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/FileContents.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/FileContents.pm @@ -109,7 +109,7 @@ sub find_file_contents_environments_and_preamble{ # that the body has a preamble my $preambleRegExp = qr/ (.*?) - (\R*)? # linebreaks at end of body into $2 + (\R*\h*)? # linebreaks at end of body into $2 \\begin\{document\} /sx; my $preamble = q(); diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/LogFile.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/LogFile.pm index 01528ed965a..309d8355bea 100644 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/LogFile.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/LogFile.pm @@ -41,7 +41,7 @@ sub processSwitches{ my $self = shift; # details of the script to log file - $self->logger("$FindBin::Script version 3.0.1, a script to indent .tex files",'heading'); + $self->logger("$FindBin::Script version 3.0.2, a script to indent .tex files",'heading'); $self->logger("$FindBin::Script lives here: $FindBin::RealBin/"); # time the script is used @@ -50,7 +50,7 @@ sub processSwitches{ if(scalar(@ARGV) < 1 or $switches{showhelp}) { print <<ENDQUOTE -latexindent.pl version 3.0.1 +latexindent.pl version 3.0.2 usage: latexindent.pl [options] [file][.tex|.sty|.cls|.bib|...] -h, --help help (see the documentation for detailed instructions and examples) diff --git a/Master/texmf-dist/scripts/latexindent/latexindent.pl b/Master/texmf-dist/scripts/latexindent/latexindent.pl index 06adc58a1b8..7cfe4a98bbd 100755 --- a/Master/texmf-dist/scripts/latexindent/latexindent.pl +++ b/Master/texmf-dist/scripts/latexindent/latexindent.pl @@ -1,4 +1,6 @@ #!/usr/bin/env perl +# latexindent.pl, version 3.0.2, 2017-05-12 +# # 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 # the Free Software Foundation, either version 3 of the License, or |