texlive[66828] trunk: latexindent (12apr23)
commits+karl at tug.org
commits+karl at tug.org
Wed Apr 12 00:26:39 CEST 2023
Revision: 66828
http://tug.org/svn/texlive?view=revision&revision=66828
Author: karl
Date: 2023-04-12 00:26:39 +0200 (Wed, 12 Apr 2023)
Log Message:
-----------
latexindent (12apr23)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl
trunk/Master/bin/windows/latexindent.exe
trunk/Master/texmf-dist/doc/support/latexindent/README
trunk/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json
trunk/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
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/LogFile.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/windows/latexindent.exe
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/support/latexindent/README
===================================================================
--- trunk/Master/texmf-dist/doc/support/latexindent/README 2023-04-11 22:26:03 UTC (rev 66827)
+++ trunk/Master/texmf-dist/doc/support/latexindent/README 2023-04-11 22:26:39 UTC (rev 66828)
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- latexindent.pl, version 3.20.5, 2023-04-07
+ latexindent.pl, version 3.20.6, 2023-04-11
PERL script to indent code within environments, and align delimited
environments in .tex files.
Modified: trunk/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json
===================================================================
--- trunk/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json 2023-04-11 22:26:03 UTC (rev 66827)
+++ trunk/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json 2023-04-11 22:26:39 UTC (rev 66828)
@@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/schema",
"$id": "latexindent-yaml-schema.json",
"title": "latexindent.pl YAML schema",
- "description": "latexindent.pl YAML schema helper, V3.20.5 2023-04-07",
+ "description": "latexindent.pl YAML schema helper, V3.20.6 2023-04-11",
"type": "object",
"properties": {
"fileExtensionPreference": {
Modified: trunk/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Document.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Document.pm 2023-04-11 22:26:03 UTC (rev 66827)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Document.pm 2023-04-11 22:26:39 UTC (rev 66828)
@@ -240,15 +240,7 @@
}
elsif ( $switches{outputToFile} ) {
- # diacritics in file names (highlighted in https://github.com/cmhughes/latexindent.pl/pull/439)
- #
- # note, related:
- #
- # git config --add core.quotePath false
- ${$self}{outputToFile} = decode( "utf-8", ${$self}{outputToFile} );
-
$logger->info("Outputting to file ${$self}{outputToFile}");
-
open( OUTPUTFILE, ">", ${$self}{outputToFile} );
print OUTPUTFILE ${$self}{body};
close(OUTPUTFILE);
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/FileExtension.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/FileExtension.pm 2023-04-11 22:26:03 UTC (rev 66827)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/FileExtension.pm 2023-04-11 22:26:39 UTC (rev 66828)
@@ -21,6 +21,7 @@
use open ':std', ':encoding(UTF-8)';
use File::Basename; # to get the filename and directory path
use Exporter qw/import/;
+use Encode qw/decode/;
use LatexIndent::GetYamlSettings qw/%mainSettings/;
use LatexIndent::Switches qw/%switches $is_check_switch_active/;
use LatexIndent::LogFile qw/$logger/;
@@ -114,7 +115,12 @@
$logger->info("*-o switch active: output file check");
- ${$self}{outputToFile} = $switches{outputToFile};
+ # diacritics in file names (highlighted in https://github.com/cmhughes/latexindent.pl/pull/439)
+ #
+ # note, related:
+ #
+ # git config --add core.quotePath false
+ ${$self}{outputToFile} = decode( "utf-8", $switches{outputToFile} );
if ( $fileName eq "-" and $switches{outputToFile} =~ m/^\+/ ) {
$logger->info("STDIN input mode active, -o switch is removing all + symbols");
@@ -124,7 +130,7 @@
# the -o file name might begin with a + symbol
if ( $switches{outputToFile} =~ m/^\+(.*)/ and $1 ne "+" ) {
$logger->info("-o switch called with + symbol at the beginning: ${$self}{outputToFile}");
- ${$self}{outputToFile} = ${$self}{baseName} . $1;
+ ${$self}{outputToFile} = decode( "utf-8", ${$self}{baseName} . $1 );
$logger->info("output file is now: ${$self}{outputToFile}");
}
@@ -137,7 +143,8 @@
# if there is no extension, then add the extension from the file to be operated upon
if ( !$ext ) {
- $logger->info("-o switch called with file name without extension: $switches{outputToFile}");
+ $logger->info(
+ "-o switch called with file name without extension: " . decode( "utf-8", $switches{outputToFile} ) );
${$self}{outputToFile} = $name . ( $name =~ m/\.\z/ ? q() : "." ) . $strippedFileExtension;
$logger->info(
"Updated to ${$self}{outputToFile} as the file extension of the input file is $strippedFileExtension");
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/LogFile.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/LogFile.pm 2023-04-11 22:26:03 UTC (rev 66827)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/LogFile.pm 2023-04-11 22:26:39 UTC (rev 66828)
@@ -129,12 +129,9 @@
# cruft directory
${$self}{cruftDirectory} = $switches{cruftDirectory} || ( dirname ${$self}{fileName} );
- # diacritics in cruft directory (highlighted in https://github.com/cmhughes/latexindent.pl/pull/439)
- ${$self}{cruftDirectory} = decode( "utf-8", ${$self}{cruftDirectory} );
-
# if cruft directory does not exist
if ( !( -d ${$self}{cruftDirectory} ) ) {
- $logger->fatal("*Could not find directory ${$self}{cruftDirectory}");
+ $logger->fatal( "*Could not find directory " . decode( "utf-8", ${$self}{cruftDirectory} ) );
$logger->fatal("Exiting, no indentation done.");
$self->output_logfile();
exit(6);
@@ -143,6 +140,8 @@
my $logfileName = ( $switches{cruftDirectory} ? ${$self}{cruftDirectory} . "/" : '' )
. ( $switches{logFileName} || "indent.log" );
+ $logfileName = decode( "utf-8", $logfileName );
+
# details of the script to log file
$logger->info("*$FindBin::Script version $versionNumber, $versionDate, a script to indent .tex files");
$logger->info("$FindBin::Script lives here: $FindBin::RealBin/");
@@ -247,7 +246,7 @@
}
$logger->info("*Directory for backup files and $logfileName:");
- $logger->info("${$self}{cruftDirectory}");
+ $logger->info( $switches{cruftDirectory} ? decode( "utf-8", ${$self}{cruftDirectory} ) : ${$self}{cruftDirectory} );
# output location of modules
if ( $FindBin::Script eq 'latexindent.pl' or ( $FindBin::Script eq 'latexindent.exe' and $switches{trace} ) ) {
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm 2023-04-11 22:26:03 UTC (rev 66827)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm 2023-04-11 22:26:39 UTC (rev 66828)
@@ -20,6 +20,6 @@
use Exporter qw/import/;
our @EXPORT_OK = qw/$versionNumber $versionDate/;
-our $versionNumber = '3.20.5';
-our $versionDate = '2023-04-07';
+our $versionNumber = '3.20.6';
+our $versionDate = '2023-04-11';
1
Modified: trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml 2023-04-11 22:26:03 UTC (rev 66827)
+++ trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml 2023-04-11 22:26:39 UTC (rev 66828)
@@ -1,5 +1,5 @@
#
-# latexindent.pl, version 3.20.5, 2023-04-07
+# latexindent.pl, version 3.20.6, 2023-04-11
#
# defaultSettings.yaml, the default settings for latexindent.pl
#
Modified: trunk/Master/texmf-dist/scripts/latexindent/latexindent.pl
===================================================================
(Binary files differ)
More information about the tex-live-commits
mailing list.