From bc036b1a7bbed0b49ebef40170780e98435f0c71 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 4 Feb 2023 21:10:32 +0000 Subject: latexindent (4feb23) git-svn-id: svn://tug.org/texlive/trunk@65730 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/win32/latexindent.exe | Bin 8703009 -> 8703065 bytes Master/texmf-dist/doc/support/latexindent/README | 2 +- .../latexindent/latexindent-yaml-schema.json | 2 +- .../doc/support/latexindent/latexindent.pdf | Bin 1241201 -> 1241116 bytes .../doc/support/latexindent/latexindent.tex | 56 ++++++++++----------- .../scripts/latexindent/LatexIndent/Version.pm | 4 +- .../scripts/latexindent/LatexIndent/Wrap.pm | 1 + .../scripts/latexindent/defaultSettings.yaml | 33 ++++++------ .../texmf-dist/scripts/latexindent/latexindent.pl | 2 +- 9 files changed, 52 insertions(+), 48 deletions(-) (limited to 'Master') diff --git a/Master/bin/win32/latexindent.exe b/Master/bin/win32/latexindent.exe index 21af46291ff..a7a7045c235 100755 Binary files a/Master/bin/win32/latexindent.exe and b/Master/bin/win32/latexindent.exe differ diff --git a/Master/texmf-dist/doc/support/latexindent/README b/Master/texmf-dist/doc/support/latexindent/README index c279ed729c3..754707746e9 100644 --- a/Master/texmf-dist/doc/support/latexindent/README +++ b/Master/texmf-dist/doc/support/latexindent/README @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - latexindent.pl, version 3.20.1, 2023-01-07 + latexindent.pl, version 3.20.2, 2023-02-04 PERL script to indent code within environments, and align delimited environments in .tex files. diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json b/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json index 6e4d1c3c754..c709f27b4e0 100644 --- a/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json +++ b/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json @@ -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.1 2023-01-07", + "description": "latexindent.pl YAML schema helper, V3.20.2 2023-02-04", "type": "object", "properties": { "fileExtensionPreference": { diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf index 5ee510be601..64f4a71bc18 100644 Binary files a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf and b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf differ diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent.tex b/Master/texmf-dist/doc/support/latexindent/latexindent.tex index 2f03cb712aa..50fa1a45e7e 100644 --- a/Master/texmf-dist/doc/support/latexindent/latexindent.tex +++ b/Master/texmf-dist/doc/support/latexindent/latexindent.tex @@ -361,169 +361,169 @@ \lstdefinestyle{fileExtensionPreference}{ style=yaml-LST, - firstnumber=44,linerange={44-48}, + firstnumber=47,linerange={47-51}, numbers=left, } \lstdefinestyle{logFilePreferences}{ style=yaml-LST, - firstnumber=88,linerange={88-102}, + firstnumber=91,linerange={91-105}, numbers=left, } \lstdefinestyle{verbatimEnvironments}{ style=yaml-LST, - firstnumber=106,linerange={106-109}, + firstnumber=109,linerange={109-112}, numbers=left, } \lstdefinestyle{verbatimCommands}{ style=yaml-LST, - firstnumber=112,linerange={112-114}, + firstnumber=115,linerange={115-117}, numbers=left, } \lstdefinestyle{noIndentBlock}{ style=yaml-LST, - firstnumber=119,linerange={119-121}, + firstnumber=122,linerange={122-124}, numbers=left, } \lstdefinestyle{removeTrailingWhitespace}{ style=yaml-LST, - firstnumber=150,linerange={150-152}, + firstnumber=153,linerange={153-155}, numbers=left, } \lstdefinestyle{fileContentsEnvironments}{ style=yaml-LST, - firstnumber=125,linerange={125-127}, + firstnumber=128,linerange={128-130}, numbers=left, } \lstdefinestyle{lookForPreamble}{ style=yaml-LST, - firstnumber=133,linerange={133-137}, + firstnumber=136,linerange={136-140}, numbers=left, } \lstdefinestyle{lookForAlignDelims}{ style=yaml-LST, - firstnumber=155,linerange={155-171}, + firstnumber=158,linerange={158-174}, numbers=left, } \lstdefinestyle{indentAfterItems}{ style=yaml-LST, - firstnumber=234,linerange={234-241}, + firstnumber=237,linerange={237-244}, numbers=left, } \lstdefinestyle{itemNames}{ style=yaml-LST, - firstnumber=247,linerange={247-249}, + firstnumber=250,linerange={250-252}, numbers=left, } \lstdefinestyle{specialBeginEnd}{ style=yaml-LST, - firstnumber=253,linerange={253-266}, + firstnumber=256,linerange={256-269}, numbers=left, } \lstdefinestyle{indentAfterHeadings}{ style=yaml-LST, - firstnumber=276,linerange={276-285}, + firstnumber=279,linerange={279-288}, numbers=left, } \lstdefinestyle{noAdditionalIndentGlobalEnv}{ style=yaml-LST, - firstnumber=334,linerange={334-335}, + firstnumber=337,linerange={337-338}, numbers=left, } \lstdefinestyle{noAdditionalIndentGlobal}{ style=yaml-LST, - firstnumber=334,linerange={334-346}, + firstnumber=337,linerange={337-349}, numbers=left, } \lstdefinestyle{indentRulesGlobalEnv}{ style=yaml-LST, - firstnumber=350,linerange={350-351}, + firstnumber=353,linerange={353-354}, numbers=left, } \lstdefinestyle{indentRulesGlobal}{ style=yaml-LST, - firstnumber=350,linerange={350-362}, + firstnumber=353,linerange={353-365}, numbers=left, } \lstdefinestyle{commandCodeBlocks}{ style=yaml-LST, - firstnumber=365,linerange={365-380}, + firstnumber=368,linerange={368-383}, numbers=left, } \lstdefinestyle{modifylinebreaks}{ style=yaml-LST, - firstnumber=495,linerange={495-497}, + firstnumber=498,linerange={498-500}, numbers=left, } \lstdefinestyle{textWrapOptions}{ style=yaml-LST, - firstnumber=523,linerange={523-524}, + firstnumber=526,linerange={526-527}, numbers=left, } \lstdefinestyle{textWrapOptionsAll}{ style=yaml-LST, - firstnumber=523,linerange={523-550}, + firstnumber=526,linerange={526-553}, numbers=left, } \lstdefinestyle{oneSentencePerLine}{ style=yaml-LST, - firstnumber=498,linerange={498-522}, + firstnumber=501,linerange={501-525}, numbers=left, } \lstdefinestyle{sentencesFollow}{ style=yaml-LST, - firstnumber=504,linerange={504-512}, + firstnumber=507,linerange={507-515}, numbers=left, } \lstdefinestyle{sentencesBeginWith}{ style=yaml-LST, - firstnumber=513,linerange={513-516}, + firstnumber=516,linerange={516-519}, numbers=left, } \lstdefinestyle{sentencesEndWith}{ style=yaml-LST, - firstnumber=517,linerange={517-522}, + firstnumber=520,linerange={520-525}, numbers=left, } \lstdefinestyle{modifylinebreaksEnv}{ style=yaml-LST, - firstnumber=552,linerange={552-561}, + firstnumber=555,linerange={555-564}, numbers=left, } \lstdefinestyle{replacements}{ style=yaml-LST, - firstnumber=613,linerange={613-621}, + firstnumber=616,linerange={616-624}, numbers=left, } \lstdefinestyle{fineTuning}{ style=yaml-LST, - firstnumber=624,linerange={624-676}, + firstnumber=627,linerange={627-679}, numbers=left, } diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm index ba83dc8f66a..b31f2dbc529 100644 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm @@ -20,6 +20,6 @@ use warnings; use Exporter qw/import/; our @EXPORT_OK = qw/$versionNumber $versionDate/; -our $versionNumber = '3.20.1'; -our $versionDate = '2023-01-07'; +our $versionNumber = '3.20.2'; +our $versionDate = '2023-02-04'; 1 diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm index b7327f824a6..9185459dae7 100644 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm @@ -324,6 +324,7 @@ sub text_wrap { } else { my $thingToMeasure = ( split( /\R/, $textWrapBlockStorage[ $textWrapBlockCount - 1 ] ) )[-1]; + $thingToMeasure =~ s/$tokens{blanklines}//; $subsequentSpace = ( $textWrapBlockCount == 0 diff --git a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml index a706ab96774..03a884e9e54 100755 --- a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml +++ b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml @@ -1,6 +1,9 @@ -# defaultSettings.yaml for latexindent.pl, version 3.20.1, 2023-01-07 -# a script that aims to -# beautify .tex, .sty, .cls files +# +# latexindent.pl, version 3.20.2, 2023-02-04 +# +# defaultSettings.yaml, the default settings for latexindent.pl +# +# a script that aims to beautify .tex, .sty, .cls files # # (or latexindent.exe if you're on Windows) # @@ -348,18 +351,18 @@ noAdditionalIndentGlobal: # set indentRules globally for codeblocks; these need # to be horizontal spaces, if they are to be used indentRulesGlobal: - environments: 0 # 0/1 - commands: 0 # 0/1 - optionalArguments: 0 # 0/1 - mandatoryArguments: 0 # 0/1 - ifElseFi: 0 # 0/1 - items: 0 # 0/1 - keyEqualsValuesBracesBrackets: 0 # 0/1 - namedGroupingBracesBrackets: 0 # 0/1 - UnNamedGroupingBracesBrackets: 0 # 0/1 - specialBeginEnd: 0 # 0/1 - afterHeading: 0 # 0/1 - filecontents: 0 # 0/1 + environments: 0 # 0/h-space + commands: 0 # 0/h-space + optionalArguments: 0 # 0/h-space + mandatoryArguments: 0 # 0/h-space + ifElseFi: 0 # 0/h-space + items: 0 # 0/h-space + keyEqualsValuesBracesBrackets: 0 # 0/h-space + namedGroupingBracesBrackets: 0 # 0/h-space + UnNamedGroupingBracesBrackets: 0 # 0/h-space + specialBeginEnd: 0 # 0/h-space + afterHeading: 0 # 0/h-space + filecontents: 0 # 0/h-space # command code block details commandCodeBlocks: diff --git a/Master/texmf-dist/scripts/latexindent/latexindent.pl b/Master/texmf-dist/scripts/latexindent/latexindent.pl index 56b7ab2733f..0319b1f9f20 100755 --- a/Master/texmf-dist/scripts/latexindent/latexindent.pl +++ b/Master/texmf-dist/scripts/latexindent/latexindent.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# latexindent.pl, version 3.20.1, 2023-01-07 +# latexindent.pl, version 3.20.2, 2023-02-04 # # 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 -- cgit v1.2.3