summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/latexindent
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-10-06 20:56:44 +0000
committerKarl Berry <karl@freefriends.org>2018-10-06 20:56:44 +0000
commit8468d42d6a37b14922df1733d45ac698ede5ff90 (patch)
treede4329973a3fe5dbb521611fc5b3fe6e2d098280 /Master/texmf-dist/scripts/latexindent
parent4dfae6add147f6fa48356ae581bc960e1b1acd56 (diff)
latexindent (6oct18)
git-svn-id: svn://tug.org/texlive/trunk@48845 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/latexindent')
-rw-r--r--Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm26
-rw-r--r--Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm4
-rwxr-xr-xMaster/texmf-dist/scripts/latexindent/defaultSettings.yaml2
-rwxr-xr-xMaster/texmf-dist/scripts/latexindent/latexindent.pl2
4 files changed, 18 insertions, 16 deletions
diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm
index 836e7ccd88d..f283eb0661c 100644
--- a/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm
+++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/Verbatim.pm
@@ -36,24 +36,25 @@ sub find_noindent_block{
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 @@ sub find_verbatim_environments{
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;
diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
index 41ca222bb3f..14e84d15c6d 100644
--- a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
+++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
@@ -19,6 +19,6 @@ use warnings;
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
diff --git a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
index 704ae17418f..69436cd7d8a 100755
--- a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
+++ b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
@@ -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
#
diff --git a/Master/texmf-dist/scripts/latexindent/latexindent.pl b/Master/texmf-dist/scripts/latexindent/latexindent.pl
index 60148de7ab3..6ff6ea348a6 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.5.1, 2018-09-15
+# latexindent.pl, version 3.5.2, 2018-10-06
#
# 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