texlive[48845] trunk: latexindent (6oct18)
commits+karl at tug.org
commits+karl at tug.org
Sat Oct 6 22:56:45 CEST 2018
Revision: 48845
http://tug.org/svn/texlive?view=revision&revision=48845
Author: karl
Date: 2018-10-06 22:56:44 +0200 (Sat, 06 Oct 2018)
Log Message:
-----------
latexindent (6oct18)
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/title.tex
trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.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 2018-10-06 18:32:44 UTC (rev 48844)
+++ trunk/Master/texmf-dist/doc/support/latexindent/README 2018-10-06 20:56:44 UTC (rev 48845)
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- latexindent.pl, version 3.5.1, 2018-09-15
+ latexindent.pl, version 3.5.2, 2018-10-06
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/title.tex
===================================================================
--- trunk/Master/texmf-dist/doc/support/latexindent/title.tex 2018-10-06 18:32:44 UTC (rev 48844)
+++ trunk/Master/texmf-dist/doc/support/latexindent/title.tex 2018-10-06 20:56:44 UTC (rev 48845)
@@ -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.5.1
+ \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.5.2
\end{tcolorbox}
}
\author{Chris Hughes \thanks{and contributors!
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm 2018-10-06 18:32:44 UTC (rev 48844)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm 2018-10-06 20:56:44 UTC (rev 48845)
@@ -36,24 +36,25 @@
if($yesno){
$logger->trace("looking for $noIndentBlock:$yesno environments") if $is_t_switch_active;
+ (my $noIndentBlockSpec = $noIndentBlock) =~ s/\*/\\*/sg;
my $noIndentRegExp = qr/
(
(?!<\\)
%
- \h* # possible horizontal spaces
+ \h* # possible horizontal spaces
\\begin\{
- $noIndentBlock # environment name captured into $2
- \} # %* \begin{noindentblock} statement
+ $noIndentBlockSpec # environment name captured into $2
+ \} # % \begin{noindentblock} statement
)
(
.*?
- ) # non-greedy match (body)
+ ) # non-greedy match (body)
(
(?!<\\)
- % # %
- \h* # possible horizontal spaces
- \\end\{$noIndentBlock\} # \end{noindentblock}
- ) # %* \end{<something>} statement
+ % # %
+ \h* # possible horizontal spaces
+ \\end\{$noIndentBlockSpec\} # \end{noindentblock}
+ ) # % \end{<something>} statement
/sx;
while( ${$self}{body} =~ m/$noIndentRegExp/sx){
@@ -99,17 +100,18 @@
if($yesno){
$logger->trace("looking for $verbEnv:$yesno environments") if $is_t_switch_active;
+ (my $verbEnvSpec = $verbEnv) =~ s/\*/\\*/sg;
my $verbatimRegExp = qr/
(
\\begin\{
- $verbEnv # environment name captured into $1
- \} # \begin{<something>} statement
+ $verbEnvSpec # environment name captured into $1
+ \} # \begin{<something>} statement
)
(
.*?
- ) # any character, but not \\begin
+ ) # any character, but not \\begin
(
- \\end\{$verbEnv\}# \end{<something>} statement
+ \\end\{$verbEnvSpec\} # \end{<something>} statement
)
/sx;
Modified: trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm 2018-10-06 18:32:44 UTC (rev 48844)
+++ trunk/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm 2018-10-06 20:56:44 UTC (rev 48845)
@@ -19,6 +19,6 @@
use Exporter qw/import/;
our @EXPORT_OK = qw/$versionNumber $versionDate/;
-our $versionNumber = '3.5.1';
-our $versionDate = '2018-09-15';
+our $versionNumber = '3.5.2';
+our $versionDate = '2018-10-06';
1
Modified: trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
===================================================================
--- trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml 2018-10-06 18:32:44 UTC (rev 48844)
+++ trunk/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml 2018-10-06 20:56:44 UTC (rev 48845)
@@ -1,4 +1,4 @@
-# defaultSettings.yaml for latexindent.pl, version 3.5.1, 2018-09-15
+# defaultSettings.yaml for latexindent.pl, version 3.5.2, 2018-10-06
# 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