From e3a95d205140a9c1ec8bc34f9a6125d8074f5e58 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 11 Jun 2020 03:02:13 +0000 Subject: CTAN sync 202006110302 --- support/latexindent/LatexIndent/Environment.pm | 2 +- support/latexindent/LatexIndent/Version.pm | 4 ++-- support/latexindent/README | 2 +- support/latexindent/defaultSettings.yaml | 2 +- support/latexindent/documentation/latexindent.pdf | Bin 873831 -> 873938 bytes .../documentation/sec-default-user-local.tex | 6 +++--- .../latexindent/documentation/sec-the-m-switch.tex | 18 +++++++++--------- support/latexindent/documentation/title.tex | 2 +- support/latexindent/latexindent.pl | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'support') diff --git a/support/latexindent/LatexIndent/Environment.pm b/support/latexindent/LatexIndent/Environment.pm index 401cbecbee..c658acedf2 100644 --- a/support/latexindent/LatexIndent/Environment.pm +++ b/support/latexindent/LatexIndent/Environment.pm @@ -51,7 +51,7 @@ sub construct_environments_regexp{ ( (?: # cluster-only (), don't capture (?! # don't include \begin in the body - (?:\\begin) # cluster-only (), don't capture + (?:\\begin\{) # cluster-only (), don't capture ). # any character, but not \\begin )*? # non-greedy (\R*)? # possible line breaks (into $5) diff --git a/support/latexindent/LatexIndent/Version.pm b/support/latexindent/LatexIndent/Version.pm index e6be60e32e..b2c63ba457 100644 --- a/support/latexindent/LatexIndent/Version.pm +++ b/support/latexindent/LatexIndent/Version.pm @@ -19,6 +19,6 @@ use warnings; use Exporter qw/import/; our @EXPORT_OK = qw/$versionNumber $versionDate/; -our $versionNumber = '3.8.1'; -our $versionDate = '2020-05-05'; +our $versionNumber = '3.8.2'; +our $versionDate = '2020-06-10'; 1 diff --git a/support/latexindent/README b/support/latexindent/README index 0c0f1c736f..24a4de4fc9 100644 --- a/support/latexindent/README +++ b/support/latexindent/README @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - latexindent.pl, version 3.8.1, 2020-05-05 + latexindent.pl, version 3.8.2, 2020-06-10 PERL script to indent code within environments, and align delimited environments in .tex files. diff --git a/support/latexindent/defaultSettings.yaml b/support/latexindent/defaultSettings.yaml index 1de1659b52..86b5113e9e 100644 --- a/support/latexindent/defaultSettings.yaml +++ b/support/latexindent/defaultSettings.yaml @@ -1,4 +1,4 @@ -# defaultSettings.yaml for latexindent.pl, version 3.8.1, 2020-05-05 +# defaultSettings.yaml for latexindent.pl, version 3.8.2, 2020-06-10 # a script that aims to # beautify .tex, .sty, .cls files # diff --git a/support/latexindent/documentation/latexindent.pdf b/support/latexindent/documentation/latexindent.pdf index b0043328b9..e8ae413aab 100644 Binary files a/support/latexindent/documentation/latexindent.pdf and b/support/latexindent/documentation/latexindent.pdf differ diff --git a/support/latexindent/documentation/sec-default-user-local.tex b/support/latexindent/documentation/sec-default-user-local.tex index 80964999a7..fc40a70b5e 100644 --- a/support/latexindent/documentation/sec-default-user-local.tex +++ b/support/latexindent/documentation/sec-default-user-local.tex @@ -624,9 +624,9 @@ latexindent.pl tabbing.tex -l=delimiterRegEx3.yaml It is possible that delimiters specified within \texttt{delimiterRegEx} can be of different lengths. Consider the file in \cref{lst:tabbing1}, and associated YAML in - \cref{lst:delimiterRegEx4}. Note that the \cref{lst:delimiterRegEx4} specifies the - option for the delimiter to be either \lstinline!#! or \lstinline!\>!, - \emph{which are different lengths}. Upon running the command + \cref{lst:delimiterRegEx4}. Note that the \cref{lst:delimiterRegEx4} + specifies the option for the delimiter to be either \lstinline!#! or + \lstinline!\>!, \emph{which are different lengths}. Upon running the command \begin{commandshell} latexindent.pl tabbing1.tex -l=delimiterRegEx4.yaml -o=+-mod4 \end{commandshell} diff --git a/support/latexindent/documentation/sec-the-m-switch.tex b/support/latexindent/documentation/sec-the-m-switch.tex index 6c4eaee57b..39d69ceb64 100644 --- a/support/latexindent/documentation/sec-the-m-switch.tex +++ b/support/latexindent/documentation/sec-the-m-switch.tex @@ -1707,17 +1707,17 @@ latexindent.pl -m pmatrix3.tex -l DBS3.yaml \toprule Code block & Sample & \multicolumn{2}{c}{Poly-switch mapping} \\ \midrule - environment & \verb!before words!$\BeginStartsOnOwnLine$ & $\BeginStartsOnOwnLine$ & BeginStartsOnOwnLine \\ - & \verb!\begin{myenv}!$\BodyStartsOnOwnLine$ & $\BodyStartsOnOwnLine$ & BodyStartsOnOwnLine \\ - & \verb!body of myenv!$\EndStartsOnOwnLine$ & $\EndStartsOnOwnLine$ & EndStartsOnOwnLine \\ - & \verb!\end{myenv}!$\EndFinishesWithLineBreak$ & $\EndFinishesWithLineBreak$ & EndFinishesWithLineBreak \\ - & \verb!after words! & & \\ + environment & \verb!before words!$\BeginStartsOnOwnLine$ & $\BeginStartsOnOwnLine$ & BeginStartsOnOwnLine \\ + & \verb!\begin{myenv}!$\BodyStartsOnOwnLine$ & $\BodyStartsOnOwnLine$ & BodyStartsOnOwnLine \\ + & \verb!body of myenv!$\EndStartsOnOwnLine$ & $\EndStartsOnOwnLine$ & EndStartsOnOwnLine \\ + & \verb!\end{myenv}!$\EndFinishesWithLineBreak$ & $\EndFinishesWithLineBreak$ & EndFinishesWithLineBreak \\ + & \verb!after words! & & \\ \cmidrule{2-4} - ifelsefi & \verb!before words!$\BeginStartsOnOwnLine$ & $\BeginStartsOnOwnLine$ & IfStartsOnOwnLine \\ - & \verb!\if...!$\BodyStartsOnOwnLine$ & $\BodyStartsOnOwnLine$ & BodyStartsOnOwnLine \\ - & \verb!body of if/or statement!$\OrStartsOnOwnLine$ & $\OrStartsOnOwnLine$ & OrStartsOnOwnLine % + ifelsefi & \verb!before words!$\BeginStartsOnOwnLine$ & $\BeginStartsOnOwnLine$ & IfStartsOnOwnLine \\ + & \verb!\if...!$\BodyStartsOnOwnLine$ & $\BodyStartsOnOwnLine$ & BodyStartsOnOwnLine \\ + & \verb!body of if/or statement!$\OrStartsOnOwnLine$ & $\OrStartsOnOwnLine$ & OrStartsOnOwnLine % \announce{2018-04-27}{new ifElseFi code block poly-switches} \\ - & \verb!\or!$\OrFinishesWithLineBreak$ & $\OrFinishesWithLineBreak$ & OrFinishesWithLineBreak \\ + & \verb!\or!$\OrFinishesWithLineBreak$ & $\OrFinishesWithLineBreak$ & OrFinishesWithLineBreak \\ & \verb!body of if/or statement!$\ElseStartsOnOwnLine$ & $\ElseStartsOnOwnLine$ & ElseStartsOnOwnLine \\ & \verb!\else!$\ElseFinishesWithLineBreak$ & $\ElseFinishesWithLineBreak$ & ElseFinishesWithLineBreak \\ & \verb!body of else statement!$\EndStartsOnOwnLine$ & $\EndStartsOnOwnLine$ & FiStartsOnOwnLine \\ diff --git a/support/latexindent/documentation/title.tex b/support/latexindent/documentation/title.tex index f1e3fa6883..3d93349f6a 100644 --- a/support/latexindent/documentation/title.tex +++ b/support/latexindent/documentation/title.tex @@ -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.8.1 + \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.8.2 \end{tcolorbox} } \author{Chris Hughes \thanks{and contributors! diff --git a/support/latexindent/latexindent.pl b/support/latexindent/latexindent.pl index ef01978c0a..c54ad5c980 100755 --- a/support/latexindent/latexindent.pl +++ b/support/latexindent/latexindent.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# latexindent.pl, version 3.8.1, 2020-05-05 +# latexindent.pl, version 3.8.2, 2020-06-10 # # 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