texlive[74619] trunk: latexindent (14mar25)
commits+karl at tug.org
commits+karl at tug.org
Fri Mar 14 22:34:12 CET 2025
Revision: 74619
https://tug.org/svn/texlive?view=revision&revision=74619
Author: karl
Date: 2025-03-14 22:34:11 +0100 (Fri, 14 Mar 2025)
Log Message:
-----------
latexindent (14mar25)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl
trunk/Master/bin/aarch64-linux/luahbtex
trunk/Master/bin/aarch64-linux/luajithbtex
trunk/Master/bin/aarch64-linux/luajittex
trunk/Master/bin/aarch64-linux/luatex
trunk/Master/bin/armhf-linux/luahbtex
trunk/Master/bin/armhf-linux/luajithbtex
trunk/Master/bin/armhf-linux/luajittex
trunk/Master/bin/armhf-linux/luatex
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/GetYamlSettings.pm
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Indent.pm
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Logger.pm
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/TrailingComments.pm
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.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/aarch64-linux/luahbtex
===================================================================
(Binary files differ)
Modified: trunk/Master/bin/aarch64-linux/luajithbtex
===================================================================
(Binary files differ)
Modified: trunk/Master/bin/aarch64-linux/luajittex
===================================================================
(Binary files differ)
Modified: trunk/Master/bin/aarch64-linux/luatex
===================================================================
(Binary files differ)
Modified: trunk/Master/bin/armhf-linux/luahbtex
===================================================================
(Binary files differ)
Modified: trunk/Master/bin/armhf-linux/luajithbtex
===================================================================
(Binary files differ)
Modified: trunk/Master/bin/armhf-linux/luajittex
===================================================================
(Binary files differ)
Modified: trunk/Master/bin/armhf-linux/luatex
===================================================================
(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 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/doc/support/latexindent/README 2025-03-14 21:34:11 UTC (rev 74619)
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- latexindent.pl, version 3.24.4, 2024-07-18
+ latexindent.pl, version 3.24.5, 2025-03-13
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 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json 2025-03-14 21:34:11 UTC (rev 74619)
@@ -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.24.4 2024-07-18",
+ "description": "latexindent.pl YAML schema helper, V3.24.5 2025-03-13",
"type": "object",
"properties": {
"fileExtensionPreference": {
@@ -324,7 +324,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!specialBeforeCommand$).*": {
"description": "name of special code block",
"type": "object",
"properties": {
@@ -333,8 +333,12 @@
"description": "regular expression containing the *beginning* part"
},
"middle": {
- "type": "string",
- "description": "optional: regular expression containing the *middle* part"
+ "type": ["string", "array"],
+ "description": "optional: one or more regular expressions for the *middle* part",
+ "items": {
+ "description": "regular expression for the *middle* part",
+ "type": "string"
+ }
},
"end": {
"type": "string",
@@ -893,7 +897,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!(BeginStartsOnOwnLine|BodyStartsOnOwnLine|EndStartsOnOwnLine|EndFinishesWithLineBreak)$).*": {
"description": "poly-switches for environments (PER-NAME)",
"type": "object",
"properties": {
@@ -947,7 +951,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!(SpecialBeginStartsOnOwnLine|SpecialBodyStartsOnOwnLine|SpecialEndStartsOnOwnLine|SpecialEndFinishesWithLineBreak)$).*": {
"description": "poly-switches for specialBeginEnd (PER-NAME)",
"type": "object",
"properties": {
@@ -996,7 +1000,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!(KeyStartsOnOwnLine|EqualsStartsOnOwnLine|EqualsFinishesWithLineBreak)$).*": {
"description": "poly-switches for key equals value (PER-NAME)",
"type": "object",
"properties": {
@@ -1065,7 +1069,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!(IfStartsOnOwnLine|BodyStartsOnOwnLine|OrStartsOnOwnLine|OrFinishesWithLineBreak|ElseStartsOnOwnLine|ElseFinishesWithLineBreak|FiStartsOnOwnLine|FiFinishesWithLineBreak)$).*": {
"description": "poly-switches for ifElseFi (PER-NAME)",
"type": "object",
"properties": {
@@ -1129,7 +1133,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!(CommandStartsOnOwnLine|CommandNameFinishesWithLineBreak)$).*": {
"description": "poly-switches for commands (PER-NAME)",
"type": "object",
"properties": {
@@ -1163,7 +1167,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!(VerbatimBeginStartsOnOwnLine|VerbatimEndFinishesWithLineBreak)$).*": {
"description": "poly-switches for verbatim (PER-NAME)",
"type": "object",
"properties": {
@@ -1197,7 +1201,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!(NameStartsOnOwnLine|NameFinishesWithLineBreak)$).*": {
"description": "poly-switches for commands (PER-NAME)",
"type": "object",
"properties": {
@@ -1231,7 +1235,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!(ItemStartsOnOwnLine|ItemFinishesWithLineBreak)$).*": {
"description": "poly-switches for items (PER-NAME)",
"type": "object",
"properties": {
@@ -1275,7 +1279,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!(LSqBStartsOnOwnLine|OptArgBodyStartsOnOwnLine|RSqBStartsOnOwnLine|RSqBFinishesWithLineBreak)$).*": {
"description": "poly-switches for optional arguments (PER-NAME)",
"type": "object",
"properties": {
@@ -1329,7 +1333,7 @@
}
},
"patternProperties": {
- ".*": {
+ "^(?!(LCuBStartsOnOwnLine|MandArgBodyStartsOnOwnLine|RCuBStartsOnOwnLine|RCuBFinishesWithLineBreak)$).*": {
"description": "poly-switches for mandatory arguments (PER-NAME)",
"type": "object",
"properties": {
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 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Document.pm 2025-03-14 21:34:11 UTC (rev 74619)
@@ -341,7 +341,7 @@
# option for comment text wrap
$self->text_wrap_comment_blocks()
- if ($is_m_switch_active
+ if ( $is_m_switch_active
and ${ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{comments} }{wrap}
and ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{when} eq 'after' );
return;
@@ -379,7 +379,7 @@
# option for comment text wrap
$self->text_wrap_comment_blocks()
- if ($is_m_switch_active
+ if ( $is_m_switch_active
and ${ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{comments} }{wrap}
and ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{when} eq 'before' );
@@ -544,7 +544,7 @@
$self->modify_line_breaks_end
if ( $is_m_switch_active and defined ${$self}{EndStartsOnOwnLine} and ${$self}{EndStartsOnOwnLine} != 0 );
$self->modify_line_breaks_end_after
- if ($is_m_switch_active
+ if ( $is_m_switch_active
and defined ${$self}{EndFinishesWithLineBreak}
and ${$self}{EndFinishesWithLineBreak} != 0 );
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/GetYamlSettings.pm 2025-03-14 21:34:11 UTC (rev 74619)
@@ -56,9 +56,9 @@
{ name => "delimiterRegEx", default => "(?<!\\\\)(&)" },
{ name => "delimiterJustification", default => "left" },
{ name => "leadingBlankColumn", default => -1 },
- { name => "lookForChildCodeBlocks", default => 1 },
- { name => "alignContentAfterDoubleBackSlash", default => 0 },
- { name => "spacesAfterDoubleBackSlash", default => 1 },
+ { name => "lookForChildCodeBlocks", default => 1 },
+ { name => "alignContentAfterDoubleBackSlash", default => 0 },
+ { name => "spacesAfterDoubleBackSlash", default => 1 },
);
sub yaml_read_settings {
@@ -750,7 +750,8 @@
my $child = $keysValues[1];
my $grandchild = $keysValues[2];
- delete $mainSettings{$parent}{$child} if (defined $mainSettings{$parent}{$child} and ref $mainSettings{$parent}{$child} ne "HASH" );
+ delete $mainSettings{$parent}{$child}
+ if ( defined $mainSettings{$parent}{$child} and ref $mainSettings{$parent}{$child} ne "HASH" );
$logger->info("Updating mainSettings with $parent: $child: $grandchild: $value");
$mainSettings{$parent}{$child}{$grandchild} = $value;
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Indent.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Indent.pm 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Indent.pm 2025-03-14 21:34:11 UTC (rev 74619)
@@ -133,7 +133,7 @@
# possibly remove paragraph line breaks
$self->remove_paragraph_line_breaks
- if ($is_m_switch_active
+ if ( $is_m_switch_active
and ${$self}{removeParagraphLineBreaks}
and !${ $mainSettings{modifyLineBreaks}{removeParagraphLineBreaks} }{beforeTextWrap} );
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Logger.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Logger.pm 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Logger.pm 2025-03-14 21:34:11 UTC (rev 74619)
@@ -18,7 +18,7 @@
use strict;
use warnings;
-use Exporter qw/import/;
+use Exporter qw/import/;
use LatexIndent::Switches qw/%switches/;
our @ISA = "LatexIndent::Document"; # class inheritance, Programming Perl, pg 321
our @EXPORT_OK = qw/@logFileLines/;
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/TrailingComments.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/TrailingComments.pm 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/TrailingComments.pm 2025-03-14 21:34:11 UTC (rev 74619)
@@ -32,11 +32,12 @@
sub construct_trailing_comment_regexp {
$notPrecededByRegExp = qr/${${$mainSettings{fineTuning}}{trailingComments}}{notPrecededBy}/;
- my $notPreceededBy = ${${mainSettings{fineTuning}}{trailingComments}}{notPreceededBy};
+ my $notPreceededBy = ${ ${ mainSettings {fineTuning} }{trailingComments} }{notPreceededBy};
- if ( $notPreceededBy ) {
+ if ($notPreceededBy) {
$logger->warn(
- "*fineTuning:trailingComments:notPreceededBy is ok for now, but in future versions, fineTuning:trailingComments:notPrecededBy will be used" );
+ "*fineTuning:trailingComments:notPreceededBy is ok for now, but in future versions, fineTuning:trailingComments:notPrecededBy will be used"
+ );
$notPrecededByRegExp = qr/$notPreceededBy/;
}
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm 2025-03-14 21:34:11 UTC (rev 74619)
@@ -11,19 +11,19 @@
our @EXPORT_OK
= qw/commandlineargs_with_encode @new_args copy_with_encode exist_with_encode open_with_encode zero_with_encode read_yaml_with_encode isdir_with_encode mkdir_with_encode/;
-our $encodingObject;
+our $encodingObject;
-if ($^O eq 'MSWin32') {
+if ( $^O eq 'MSWin32' ) {
my $encoding_sys = 'cp' . Win32::GetACP();
- $encodingObject = find_encoding( $encoding_sys );
-
+ $encodingObject = find_encoding($encoding_sys);
+
# Check if the encoding is valid.
unless ( ref($encodingObject) ) {
- $encodingObject = find_encoding( 'utf-8' );
+ $encodingObject = find_encoding('utf-8');
}
}
else {
- $encodingObject = find_encoding( 'utf-8' );
+ $encodingObject = find_encoding('utf-8');
}
sub copy_with_encode {
@@ -36,7 +36,7 @@
copyW( $source, $destination, 1 );
}
else {
- $source = $encodingObject->encode($source);
+ $source = $encodingObject->encode($source);
$destination = $encodingObject->encode($destination);
copy( $source, $destination );
}
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm 2025-03-14 21:34:11 UTC (rev 74619)
@@ -592,7 +592,7 @@
$self->modify_line_breaks_end
if ( $is_m_switch_active and defined ${$self}{EndStartsOnOwnLine} and ${$self}{EndStartsOnOwnLine} != 0 );
$self->modify_line_breaks_end_after
- if ($is_m_switch_active
+ if ( $is_m_switch_active
and defined ${$self}{EndFinishesWithLineBreak}
and ${$self}{EndFinishesWithLineBreak} != 0 );
}
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm 2025-03-14 21:34:11 UTC (rev 74619)
@@ -20,6 +20,6 @@
use Exporter qw/import/;
our @EXPORT_OK = qw/$versionNumber $versionDate/;
-our $versionNumber = '3.24.4';
-our $versionDate = '2024-07-18';
+our $versionNumber = '3.24.5';
+our $versionDate = '2025-03-13';
1
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm 2025-03-14 21:34:11 UTC (rev 74619)
@@ -660,11 +660,11 @@
my $columns = ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{columns};
# fail gracefully if columns == 0
- if ($columns==0){
+ if ( $columns == 0 ) {
$logger->warn("* textWrapOptions: columns is set to 0, can't text wrap with this");
${ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{comments} }{wrap} = 0;
return;
- }
+ }
#
# text wrap comment blocks
Modified: trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml 2025-03-14 18:11:25 UTC (rev 74618)
+++ trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml 2025-03-14 21:34:11 UTC (rev 74619)
@@ -1,5 +1,5 @@
#
-# latexindent.pl, version 3.24.4, 2024-07-18
+# latexindent.pl, version 3.24.5, 2025-03-13
#
# defaultSettings.yaml, the default settings for latexindent.pl
#
@@ -528,7 +528,7 @@
questionMark: 1 # 0/1
other: 0 # regex
sentencesDoNOTcontain:
- other: \\begin # regex
+ other: \\begin|\\end # regex
textWrapOptions:
columns: 0
multipleSpacesToSingle: 1
Modified: trunk/Master/texmf-dist/scripts/latexindent/latexindent.pl
===================================================================
(Binary files differ)
More information about the tex-live-commits
mailing list.