From c51eadf9bfbc4973431a41ea48a79571a0a4a5e5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Mar 2021 21:43:20 +0000 Subject: latexindent (21mar21) git-svn-id: svn://tug.org/texlive/trunk@58595 c570f23f-e606-0410-a88d-b1316a301751 --- .../LatexIndent/NamedGroupingBracesBrackets.pm | 25 ++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'Master/texmf-dist/scripts/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm') diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm index f20e23ca547..50b00ed556f 100755 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm @@ -35,8 +35,29 @@ sub construct_grouping_braces_brackets_regexp{ my $optAndMandRegExp = $self->get_arguments_regexp; # read from fine tuning - my $NamedGroupingBracesBracketsRegExp = qr/${${$masterSettings{fineTuning}}{NamedGroupingBracesBrackets}}{name}/; - my $NamedGroupingFollowRegExp = qr/${${$masterSettings{fineTuning}}{NamedGroupingBracesBrackets}}{follow}/; + my $NamedGroupingBracesBracketsRegExp = qr/${${$masterSettings{fineTuning}}{namedGroupingBracesBrackets}}{name}/; + my $NamedGroupingFollowRegExp = qr/${${$masterSettings{fineTuning}}{namedGroupingBracesBrackets}}{follow}/; + + # defaultSettings.yaml mistakenly had + # + # fineTuning: + # NamedGroupingBracesBrackets: + # + # when it should have been + # + # fineTuning: + # namedGroupingBracesBrackets: + # + # the mistake was mine, so I feel that the following is necessary; if we + # get to V4, then this will be removed and only namedGroupingBracesBrackets will be supported + if(${${$masterSettings{fineTuning}}{NamedGroupingBracesBrackets}}{name}){ + $logger->warn("*fineTuning:NamedGroupingBracesBrackets is ok for now, but in future versions, fineTuning:namedGroupingBracesBrackets will be used"); + $NamedGroupingBracesBracketsRegExp = qr/${${$masterSettings{fineTuning}}{NamedGroupingBracesBrackets}}{name}/; + } + if(${${$masterSettings{fineTuning}}{NamedGroupingBracesBrackets}}{follow}){ + $logger->warn("*fineTuning:NamedGroupingBracesBrackets is ok for now, but in future versions, fineTuning:namedGroupingBracesBrackets will be used"); + $NamedGroupingFollowRegExp = qr/${${$masterSettings{fineTuning}}{NamedGroupingBracesBrackets}}{follow}/; + } # store the regular expresssion for matching and replacing $grouping_braces_regexp = qr/ -- cgit v1.2.3