texlive[59121] trunk: latexindent (7may21)
commits+karl at tug.org
commits+karl at tug.org
Fri May 7 22:18:27 CEST 2021
Revision: 59121
http://tug.org/svn/texlive?view=revision&revision=59121
Author: karl
Date: 2021-05-07 22:18:27 +0200 (Fri, 07 May 2021)
Log Message:
-----------
latexindent (7may21)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl
trunk/Master/bin/win32/latexindent.exe
trunk/Master/texmf-dist/doc/support/latexindent/README
trunk/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
trunk/Master/texmf-dist/doc/support/latexindent/sec-default-user-local.tex
trunk/Master/texmf-dist/doc/support/latexindent/sec-how-to-use.tex
trunk/Master/texmf-dist/doc/support/latexindent/sec-the-m-switch.tex
trunk/Master/texmf-dist/doc/support/latexindent/title.tex
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Document.pm
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/FileExtension.pm
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Logger.pm
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
trunk/Master/texmf-dist/scripts/latexindent/latexindent.pl
Modified: trunk/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl
===================================================================
(Binary files differ)
Modified: trunk/Master/bin/win32/latexindent.exe
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/support/latexindent/README
===================================================================
--- trunk/Master/texmf-dist/doc/support/latexindent/README 2021-05-07 20:18:01 UTC (rev 59120)
+++ trunk/Master/texmf-dist/doc/support/latexindent/README 2021-05-07 20:18:27 UTC (rev 59121)
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- latexindent.pl, version 3.9.2, 2021-04-06
+ latexindent.pl, version 3.9.3, 2021-05-07
PERL script to indent code within environments, and align delimited
environments in .tex files.
Modified: trunk/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/support/latexindent/sec-default-user-local.tex
===================================================================
--- trunk/Master/texmf-dist/doc/support/latexindent/sec-default-user-local.tex 2021-05-07 20:18:01 UTC (rev 59120)
+++ trunk/Master/texmf-dist/doc/support/latexindent/sec-default-user-local.tex 2021-05-07 20:18:27 UTC (rev 59121)
@@ -152,7 +152,8 @@
%(*@@*)\end{noindent}
\end{cmhlistings}
- Important note: it is assumed that the \texttt{noindent} block statements appear on their own line.
+ Important note: it is assumed that the \texttt{noindent} block statements appear on
+ their own line.
\yamltitle{removeTrailingWhitespace}*{fields}\label{yaml:removeTrailingWhitespace}
Modified: trunk/Master/texmf-dist/doc/support/latexindent/sec-how-to-use.tex
===================================================================
--- trunk/Master/texmf-dist/doc/support/latexindent/sec-how-to-use.tex 2021-05-07 20:18:01 UTC (rev 59120)
+++ trunk/Master/texmf-dist/doc/support/latexindent/sec-how-to-use.tex 2021-05-07 20:18:27 UTC (rev 59121)
@@ -317,6 +317,13 @@
if you wish to change the name of this file, simply call the script with your chosen name
after the \texttt{-g} switch as demonstrated above.
+ \announce*{2021-05-07}{log file creation updated} If \texttt{latexindent.pl} can not open the log file that you
+ specify, then the script will operate, and no log file will be produced; this might be
+ helpful to users who wish to specify the following, for example
+ \begin{commandshell}
+latexindent.pl -g /dev/null myfile.tex
+\end{commandshell}
+
\flagbox{-sl, --screenlog}
\index{switches!-sl, --screenlog definition and details}
\begin{commandshell}
Modified: trunk/Master/texmf-dist/doc/support/latexindent/sec-the-m-switch.tex
===================================================================
--- trunk/Master/texmf-dist/doc/support/latexindent/sec-the-m-switch.tex 2021-05-07 20:18:01 UTC (rev 59120)
+++ trunk/Master/texmf-dist/doc/support/latexindent/sec-the-m-switch.tex 2021-05-07 20:18:27 UTC (rev 59121)
@@ -1901,17 +1901,17 @@
\toprule
Code block & Sample & \multicolumn{2}{c}{Poly-switch mapping} \\
\midrule
- environment & \verb!before words!$\BeginStartsOnOwnLine$ & $\BeginStartsOnOwnLine$ & BeginStartsOnOwnLine \\
- & \verb!\begin{myenv}!$\BodyStartsOnOwnLine$ & $\BodyStartsOnOwnLine$ & BodyStartsOnOwnLine \\
- & \verb!body of myenv!$\EndStartsOnOwnLine$ & $\EndStartsOnOwnLine$ & EndStartsOnOwnLine \\
- & \verb!\end{myenv}!$\EndFinishesWithLineBreak$ & $\EndFinishesWithLineBreak$ & EndFinishesWithLineBreak \\
- & \verb!after words! & & \\
+ environment & \verb!before words!$\BeginStartsOnOwnLine$ & $\BeginStartsOnOwnLine$ & BeginStartsOnOwnLine \\
+ & \verb!\begin{myenv}!$\BodyStartsOnOwnLine$ & $\BodyStartsOnOwnLine$ & BodyStartsOnOwnLine \\
+ & \verb!body of myenv!$\EndStartsOnOwnLine$ & $\EndStartsOnOwnLine$ & EndStartsOnOwnLine \\
+ & \verb!\end{myenv}!$\EndFinishesWithLineBreak$ & $\EndFinishesWithLineBreak$ & EndFinishesWithLineBreak \\
+ & \verb!after words! & & \\
\cmidrule{2-4}
- ifelsefi & \verb!before words!$\BeginStartsOnOwnLine$ & $\BeginStartsOnOwnLine$ & IfStartsOnOwnLine \\
- & \verb!\if...!$\BodyStartsOnOwnLine$ & $\BodyStartsOnOwnLine$ & BodyStartsOnOwnLine \\
- & \verb!body of if/or statement!$\OrStartsOnOwnLine$ & $\OrStartsOnOwnLine$ & OrStartsOnOwnLine %
+ ifelsefi & \verb!before words!$\BeginStartsOnOwnLine$ & $\BeginStartsOnOwnLine$ & IfStartsOnOwnLine \\
+ & \verb!\if...!$\BodyStartsOnOwnLine$ & $\BodyStartsOnOwnLine$ & BodyStartsOnOwnLine \\
+ & \verb!body of if/or statement!$\OrStartsOnOwnLine$ & $\OrStartsOnOwnLine$ & OrStartsOnOwnLine %
\announce{2018-04-27}{new ifElseFi code block poly-switches} \\
- & \verb!\or!$\OrFinishesWithLineBreak$ & $\OrFinishesWithLineBreak$ & OrFinishesWithLineBreak \\
+ & \verb!\or!$\OrFinishesWithLineBreak$ & $\OrFinishesWithLineBreak$ & OrFinishesWithLineBreak \\
& \verb!body of if/or statement!$\ElseStartsOnOwnLine$ & $\ElseStartsOnOwnLine$ & ElseStartsOnOwnLine \\
& \verb!\else!$\ElseFinishesWithLineBreak$ & $\ElseFinishesWithLineBreak$ & ElseFinishesWithLineBreak \\
& \verb!body of else statement!$\EndStartsOnOwnLine$ & $\EndStartsOnOwnLine$ & FiStartsOnOwnLine \\
Modified: trunk/Master/texmf-dist/doc/support/latexindent/title.tex
===================================================================
--- trunk/Master/texmf-dist/doc/support/latexindent/title.tex 2021-05-07 20:18:01 UTC (rev 59120)
+++ trunk/Master/texmf-dist/doc/support/latexindent/title.tex 2021-05-07 20:18:27 UTC (rev 59121)
@@ -8,7 +8,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.9.2
+ \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.9.3
\end{tcolorbox}
}
\author{Chris Hughes \thanks{and contributors!
@@ -15,7 +15,7 @@
See \vref{sec:contributors}.
For
all communication, please visit \cite{latexindent-home}.}}
-\date{2021-04-06}
+\date{2021-05-07}
\maketitle
\begin{adjustwidth}{1cm}{1cm}
\small
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Document.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Document.pm 2021-05-07 20:18:01 UTC (rev 59120)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Document.pm 2021-05-07 20:18:27 UTC (rev 59121)
@@ -153,6 +153,19 @@
$logger->info("Not outputting to file; see -w and -o switches for more options.");
}
+ # output the log file information
+ $self->output_logfile();
+
+ # output to screen, unless silent mode
+ print ${$self}{body} unless $switches{silentMode};
+
+ return;
+}
+
+sub output_logfile{
+
+ my $self = shift;
+ #
# put the final line in the logfile
$logger->info("${$masterSettings{logFilePreferences}}{endLogFileWith}") if ${$masterSettings{logFilePreferences}}{endLogFileWith};
@@ -162,19 +175,18 @@
# open log file
my $logfileName = $switches{logFileName}||"indent.log";
my $logfile;
- open($logfile,">","${$self}{cruftDirectory}/$logfileName") or die "Can't open $logfileName";
+ my $logfilePossible = 1;
+ open($logfile,">","${$self}{cruftDirectory}/$logfileName") or $logfilePossible =0;
- foreach my $line (@{LatexIndent::Logger::logFileLines}){
- print $logfile $line,"\n";
- }
+ if($logfilePossible){
+ foreach my $line (@{LatexIndent::Logger::logFileLines}){
+ print $logfile $line,"\n";
+ }
- # close log file
- close($logfile);
-
- # output to screen, unless silent mode
- print ${$self}{body} unless $switches{silentMode};
+ # close log file
+ close($logfile);
+ }
- return;
}
sub process_body_of_text{
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/FileExtension.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/FileExtension.pm 2021-05-07 20:18:01 UTC (rev 59120)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/FileExtension.pm 2021-05-07 20:18:27 UTC (rev 59121)
@@ -48,8 +48,8 @@
if ($fileName ne "-"){
if (!$ext) {
$logger->info("*File extension work:");
- $logger->info("latexindent called to act upon $fileName without a file extension;\nsearching for file with an extension in the following order (see fileExtensionPreference):");
- $logger->info(join("\n", at fileExtensions));
+ $logger->info("latexindent called to act upon $fileName without a file extension;\nsearching for files in the following order (see fileExtensionPreference):");
+ $logger->info($fileName.join("\n$fileName", at fileExtensions));
my $fileFound = 0;
# loop through the known file extensions (see @fileExtensions)
@@ -70,13 +70,15 @@
$logger->fatal("I searched for $fileName$_");
}
$logger->fatal("but couldn't find any of them.\nConsider updating fileExtensionPreference.\nExiting, no indendation done.");
- die "I couldn't find a match for $fileName in fileExtensionPreference.\nExiting, no indendation done.";
+ $self->output_logfile();
+ die "ERROR: I couldn't find any of the following files: ".$fileName.join(", $fileName", at fileExtensions)." (see fileExtensionPreference)\nExiting, no indendation done.";
}
} else {
# if the file has a recognised extension, check that the file exists
unless( -e $fileName ){
- my $message = "I couldn't find $fileName, are you sure it exists?.\nNo indentation done.\nExiting.";
+ my $message = "ERROR: I couldn't find $fileName, are you sure it exists?\nNo indentation done.\nExiting.";
$logger->fatal("*$message");
+ $self->output_logfile();
die $message;
}
}
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Logger.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Logger.pm 2021-05-07 20:18:01 UTC (rev 59120)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Logger.pm 2021-05-07 20:18:27 UTC (rev 59121)
@@ -49,6 +49,20 @@
print $logfileline,"\n" if $switches{screenlog};
}
+sub fatal{
+ my $self = shift;
+ my $logfileline = shift;
+ if ($logfileline =~ m/^\*/s){
+ $logfileline =~ s/^\*/FATAL /s;
+ $logfileline =~ s/^/ /mg;
+ $logfileline =~ s/^\h+FATAL/FATAL/s;
+ } else {
+ $logfileline =~ s/^/ /mg;
+ }
+ push(@logFileLines,$logfileline);
+ print $logfileline,"\n" if $switches{screenlog};
+}
+
sub trace{
my $self = shift;
my $logfileline = shift;
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm 2021-05-07 20:18:01 UTC (rev 59120)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm 2021-05-07 20:18:27 UTC (rev 59121)
@@ -19,6 +19,6 @@
use Exporter qw/import/;
our @EXPORT_OK = qw/$versionNumber $versionDate/;
-our $versionNumber = '3.9.2';
-our $versionDate = '2021-04-06';
+our $versionNumber = '3.9.3';
+our $versionDate = '2021-05-07';
1
Modified: trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml 2021-05-07 20:18:01 UTC (rev 59120)
+++ trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml 2021-05-07 20:18:27 UTC (rev 59121)
@@ -1,4 +1,4 @@
-# defaultSettings.yaml for latexindent.pl, version 3.9.2, 2021-04-06
+# defaultSettings.yaml for latexindent.pl, version 3.9.3, 2021-05-07
# a script that aims to
# beautify .tex, .sty, .cls files
#
Modified: trunk/Master/texmf-dist/scripts/latexindent/latexindent.pl
===================================================================
(Binary files differ)
More information about the tex-live-commits
mailing list.