diff options
author | Karl Berry <karl@freefriends.org> | 2023-11-19 21:31:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-11-19 21:31:07 +0000 |
commit | e6d80c059c6f406941d26d63e1de56e06e81d316 (patch) | |
tree | c679da0bfdd10ad13103df312691c3eb5b6cfb5f | |
parent | ec4c05eb534d8038353f24a68cc69b1802c6742d (diff) |
latexindent (19nov23)
git-svn-id: svn://tug.org/texlive/trunk@68909 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl | 2 | ||||
-rwxr-xr-x | Master/bin/windows/latexindent.exe | bin | 9939451 -> 9939505 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latexindent/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/latexindent/latexindent.pdf | bin | 1268947 -> 1268973 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latexindent/latexindent.tex | 48 | ||||
-rw-r--r-- | Master/texmf-dist/scripts/latexindent/LatexIndent/FileContents.pm | 5 | ||||
-rw-r--r-- | Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm | 4 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/latexindent/defaultSettings.yaml | 3 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/latexindent/latexindent.pl | 2 |
10 files changed, 36 insertions, 32 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl b/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl index 1e9d4860754..42bc173040a 100755 --- a/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl +++ b/Build/source/texk/texlive/linked_scripts/latexindent/latexindent.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# latexindent.pl, version 3.23.3, 2023-10-13 +# latexindent.pl, version 3.23.4, 2023-11-19 # # 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 diff --git a/Master/bin/windows/latexindent.exe b/Master/bin/windows/latexindent.exe Binary files differindex a48023fd812..3cb17583c02 100755 --- a/Master/bin/windows/latexindent.exe +++ b/Master/bin/windows/latexindent.exe diff --git a/Master/texmf-dist/doc/support/latexindent/README b/Master/texmf-dist/doc/support/latexindent/README index 9e6978dde6a..1672bf12d70 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.23.3, 2023-10-13 + latexindent.pl, version 3.23.4, 2023-11-19 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 be2f6c9832b..630d9b87bf1 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.23.3 2023-10-13", + "description": "latexindent.pl YAML schema helper, V3.23.4 2023-11-19", "type": "object", "properties": { "fileExtensionPreference": { diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf Binary files differindex 7793086df10..8c1d88a8894 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 87d9b7969a9..cf495854664 100644 --- a/Master/texmf-dist/doc/support/latexindent/latexindent.tex +++ b/Master/texmf-dist/doc/support/latexindent/latexindent.tex @@ -391,7 +391,7 @@ \lstdefinestyle{removeTrailingWhitespace}{ style=yaml-LST, - firstnumber=152,linerange={152-154}, + firstnumber=153,linerange={153-155}, numbers=left, } @@ -403,133 +403,133 @@ \lstdefinestyle{lookForPreamble}{ style=yaml-LST, - firstnumber=135,linerange={135-139}, + firstnumber=135,linerange={135-140}, numbers=left, } \lstdefinestyle{lookForAlignDelims}{ style=yaml-LST, - firstnumber=157,linerange={157-175}, + firstnumber=158,linerange={158-176}, numbers=left, } \lstdefinestyle{indentAfterItems}{ style=yaml-LST, - firstnumber=240,linerange={240-247}, + firstnumber=241,linerange={241-248}, numbers=left, } \lstdefinestyle{itemNames}{ style=yaml-LST, - firstnumber=253,linerange={253-255}, + firstnumber=254,linerange={254-256}, numbers=left, } \lstdefinestyle{specialBeginEnd}{ style=yaml-LST, - firstnumber=259,linerange={259-273}, + firstnumber=260,linerange={260-274}, numbers=left, } \lstdefinestyle{indentAfterHeadings}{ style=yaml-LST, - firstnumber=283,linerange={283-292}, + firstnumber=284,linerange={284-293}, numbers=left, } \lstdefinestyle{noAdditionalIndentGlobalEnv}{ style=yaml-LST, - firstnumber=341,linerange={341-342}, + firstnumber=342,linerange={342-343}, numbers=left, } \lstdefinestyle{noAdditionalIndentGlobal}{ style=yaml-LST, - firstnumber=341,linerange={341-353}, + firstnumber=342,linerange={342-354}, numbers=left, } \lstdefinestyle{indentRulesGlobalEnv}{ style=yaml-LST, - firstnumber=357,linerange={357-358}, + firstnumber=358,linerange={358-359}, numbers=left, } \lstdefinestyle{indentRulesGlobal}{ style=yaml-LST, - firstnumber=357,linerange={357-369}, + firstnumber=358,linerange={358-370}, numbers=left, } \lstdefinestyle{commandCodeBlocks}{ style=yaml-LST, - firstnumber=372,linerange={372-387}, + firstnumber=373,linerange={373-388}, numbers=left, } \lstdefinestyle{modifylinebreaks}{ style=yaml-LST, - firstnumber=500,linerange={500-502}, + firstnumber=501,linerange={501-503}, numbers=left, } \lstdefinestyle{textWrapOptions}{ style=yaml-LST, - firstnumber=530,linerange={530-531}, + firstnumber=531,linerange={531-532}, numbers=left, } \lstdefinestyle{textWrapOptionsAll}{ style=yaml-LST, - firstnumber=530,linerange={530-557}, + firstnumber=531,linerange={531-558}, numbers=left, } \lstdefinestyle{oneSentencePerLine}{ style=yaml-LST, - firstnumber=503,linerange={503-529}, + firstnumber=504,linerange={504-530}, numbers=left, } \lstdefinestyle{sentencesFollow}{ style=yaml-LST, - firstnumber=509,linerange={509-517}, + firstnumber=510,linerange={510-518}, numbers=left, } \lstdefinestyle{sentencesBeginWith}{ style=yaml-LST, - firstnumber=518,linerange={518-521}, + firstnumber=519,linerange={519-522}, numbers=left, } \lstdefinestyle{sentencesEndWith}{ style=yaml-LST, - firstnumber=522,linerange={522-527}, + firstnumber=523,linerange={523-528}, numbers=left, } \lstdefinestyle{sentencesDoNOTcontain}{ style=yaml-LST, - firstnumber=528,linerange={528-529}, + firstnumber=529,linerange={529-530}, numbers=left, } \lstdefinestyle{modifylinebreaksEnv}{ style=yaml-LST, - firstnumber=559,linerange={559-568}, + firstnumber=560,linerange={560-569}, numbers=left, } \lstdefinestyle{replacements}{ style=yaml-LST, - firstnumber=620,linerange={620-625}, + firstnumber=621,linerange={621-626}, numbers=left, } \lstdefinestyle{fineTuning}{ style=yaml-LST, - firstnumber=629,linerange={629-684}, + firstnumber=630,linerange={630-685}, numbers=left, } @@ -8961,7 +8961,7 @@ docker run ghcr.io/cmhughes/latexindent.pl -h \end{cmhlistings} Once I have run the above, on subsequent logins I run - \begin{cmhlistings}[style=tcblatex,language=Bash]{\texttt{docker-install.sh}}{lst:docker-install} + \begin{cmhlistings}[style=tcblatex,language=Bash]{\texttt{docker-install.sh}}{lst:docker-install-subsequent} newgrp docker docker run ghcr.io/cmhughes/latexindent.pl -h \end{cmhlistings} diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/FileContents.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/FileContents.pm index 730858094bd..c96eabe548b 100644 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/FileContents.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/FileContents.pm @@ -136,7 +136,10 @@ sub find_file_contents_environments_and_preamble { my $needToStorePreamble = 0; # try and find the preamble - if ( ${$self}{body} =~ m/$preambleRegExp/sx and ${ $mainSettings{lookForPreamble} }{ ${$self}{fileExtension} } ) { + my $lookForPreamble = ${ $mainSettings{lookForPreamble} }{ ${$self}{fileExtension} }; + $lookForPreamble = 1 if ( ${$self}{fileName} eq "-" and ${ $mainSettings{lookForPreamble} }{STDIN} ); + + if ( ${$self}{body} =~ m/$preambleRegExp/sx and $lookForPreamble ) { $logger->trace( "\\begin{document} found in body (after searching for filecontents)-- assuming that a preamble exists") diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm index ba3d1433ddc..24ff152679a 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.23.3'; -our $versionDate = '2023-10-13'; +our $versionNumber = '3.23.4'; +our $versionDate = '2023-11-19'; 1 diff --git a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml index 67a2c4fbf4f..56d4be4c3da 100755 --- a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml +++ b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml @@ -1,5 +1,5 @@ # -# latexindent.pl, version 3.23.3, 2023-10-13 +# latexindent.pl, version 3.23.4, 2023-11-19 # # defaultSettings.yaml, the default settings for latexindent.pl # @@ -137,6 +137,7 @@ lookForPreamble: .sty: 0 .cls: 0 .bib: 0 + STDIN: 1 # some preambles can contain \begin and \end statements # that are not in their 'standard environment block', for example, diff --git a/Master/texmf-dist/scripts/latexindent/latexindent.pl b/Master/texmf-dist/scripts/latexindent/latexindent.pl index 1e9d4860754..42bc173040a 100755 --- a/Master/texmf-dist/scripts/latexindent/latexindent.pl +++ b/Master/texmf-dist/scripts/latexindent/latexindent.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# latexindent.pl, version 3.23.3, 2023-10-13 +# latexindent.pl, version 3.23.4, 2023-11-19 # # 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 |