summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/support/latexindent
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-19 21:08:33 +0000
committerKarl Berry <karl@freefriends.org>2017-06-19 21:08:33 +0000
commitc04832b03eaaffc534e100205b65081c5fbad47f (patch)
tree9e53a22d44f49bc3a843eb5acd5d605fa3815414 /Master/texmf-dist/doc/support/latexindent
parent4a7e4115e0329b992349b8454179645f1bda63bb (diff)
latexindent (19jun17)
git-svn-id: svn://tug.org/texlive/trunk@44642 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/support/latexindent')
-rw-r--r--Master/texmf-dist/doc/support/latexindent/README2
-rw-r--r--Master/texmf-dist/doc/support/latexindent/latexindent.pdfbin565222 -> 570961 bytes
-rw-r--r--Master/texmf-dist/doc/support/latexindent/latexindent.tex95
-rw-r--r--Master/texmf-dist/doc/support/latexindent/sec-default-user-local.tex57
-rw-r--r--Master/texmf-dist/doc/support/latexindent/sec-the-m-switch.tex38
-rw-r--r--Master/texmf-dist/doc/support/latexindent/subsubsec-no-add-remaining-code-blocks.tex2
6 files changed, 123 insertions, 71 deletions
diff --git a/Master/texmf-dist/doc/support/latexindent/README b/Master/texmf-dist/doc/support/latexindent/README
index f3a55f4978e..a55d4c72804 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.1, 2017-05-27
+ latexindent.pl, version 3.2, 2017-06-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.pdf b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
index 3bf881f5e4c..1df40469213 100644
--- a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
+++ b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent.tex b/Master/texmf-dist/doc/support/latexindent/latexindent.tex
index 7ef945c18ac..8dffa3fa4e6 100644
--- a/Master/texmf-dist/doc/support/latexindent/latexindent.tex
+++ b/Master/texmf-dist/doc/support/latexindent/latexindent.tex
@@ -135,12 +135,14 @@
listing options={#1},
}
-\DeclareTCBInputListing[use counter=lstlisting]{\cmhlistingsfromfile}{O{} m O{} m m}{%
+% \cmhlistingsfromfile uses listings library
+% \cmhlistingsfromfile* uses minted library
+\DeclareTCBInputListing[use counter=lstlisting]{\cmhlistingsfromfile}{s O{} m O{} m m}{%
cmhlistings,
- listing file={#2},
- listing options={#1},
- title={\color{black}{\scshape Listing \thetcbcounter}: ~#4},label={#5},
- #3,
+ listing file={#3},
+ IfBooleanTF={#1}{minted options={obeytabs=true,showtabs=true,tabsize=4,showspaces=false,#2}}{listing options={#2}},
+ title={\color{black}{\scshape Listing \thetcbcounter}: ~#5},label={#6},
+ #4,
}
% command shell
@@ -209,112 +211,134 @@
\lstdefinestyle{logFilePreferences}{
style=yaml-LST,
- firstnumber=79,linerange={79-83},numbers=left
+ firstnumber=79,linerange={79-83},
+ numbers=left,
}
\lstdefinestyle{verbatimEnvironments}{
style=yaml-LST,
- firstnumber=87,linerange={87-90},numbers=left
+ firstnumber=87,linerange={87-90},
+ numbers=left,
}
\lstdefinestyle{verbatimCommands}{
style=yaml-LST,
- firstnumber=93,linerange={93-95},numbers=left
+ firstnumber=93,linerange={93-95},
+ numbers=left,
}
\lstdefinestyle{noIndentBlock}{
style=yaml-LST,
- firstnumber=101,linerange={101-103},numbers=left
+ firstnumber=101,linerange={101-103},
+ numbers=left,
}
\lstdefinestyle{removeTrailingWhitespace}{
style=yaml-LST,
- firstnumber=106,linerange={106-108},numbers=left
+ firstnumber=106,linerange={106-108},
+ numbers=left,
}
\lstdefinestyle{fileContentsEnvironments}{
style=yaml-LST,
- firstnumber=112,linerange={112-114},numbers=left
+ firstnumber=112,linerange={112-114},
+ numbers=left,
}
\lstdefinestyle{lookForPreamble}{
style=yaml-LST,
- firstnumber=120,linerange={120-124},numbers=left
+ firstnumber=120,linerange={120-124},
+ numbers=left,
}
\lstdefinestyle{indentAfterItems}{
style=yaml-LST,
- firstnumber=172,linerange={172-176},numbers=left
+ firstnumber=174,linerange={174-178},
+ numbers=left,
}
\lstdefinestyle{itemNames}{
style=yaml-LST,
- firstnumber=182,linerange={182-184},numbers=left
+ firstnumber=184,linerange={184-186},
+ numbers=left,
}
\lstdefinestyle{specialBeginEnd}{
style=yaml-LST,
- firstnumber=188,linerange={188-200},numbers=left
+ firstnumber=190,linerange={190-202},
+ numbers=left,
}
\lstdefinestyle{indentAfterHeadings}{
style=yaml-LST,
- firstnumber=210,linerange={210-219},numbers=left
+ firstnumber=212,linerange={212-221},
+ numbers=left,
}
\lstdefinestyle{noAdditionalIndentGlobalEnv}{
style=yaml-LST,
- firstnumber=265,linerange={265-266},numbers=left
+ firstnumber=267,linerange={267-268},
+ numbers=left,
}
\lstdefinestyle{noAdditionalIndentGlobal}{
style=yaml-LST,
- firstnumber=265,linerange={265-277},numbers=left
+ firstnumber=267,linerange={267-279},
+ numbers=left,
}
\lstdefinestyle{indentRulesGlobalEnv}{
style=yaml-LST,
- firstnumber=281,linerange={281-282},numbers=left
+ firstnumber=283,linerange={283-284},
+ numbers=left,
}
\lstdefinestyle{indentRulesGlobal}{
style=yaml-LST,
- firstnumber=281,linerange={281-293},numbers=left
+ firstnumber=283,linerange={283-295},
+ numbers=left,
}
\lstdefinestyle{commandCodeBlocks}{
style=yaml-LST,
- firstnumber=296,linerange={296-304},numbers=left
+ firstnumber=298,linerange={298-306},
+ numbers=left,
}
\lstdefinestyle{modifylinebreaks}{
style=yaml-LST,
- firstnumber=374,linerange={374-376},numbers=left
+ firstnumber=376,linerange={376-378},
+ numbers=left,
}
\lstdefinestyle{textWrapOptions}{
style=yaml-LST,
- firstnumber=377,linerange={377-378},numbers=left
+ firstnumber=379,linerange={379-380},
+ numbers=left,
}
\lstdefinestyle{textWrapOptionsAll}{
style=yaml-LST,
- firstnumber=377,linerange={377-379},numbers=left
+ firstnumber=379,linerange={379-381},
+ numbers=left,
}
\lstdefinestyle{removeParagraphLineBreaks}{
style=yaml-LST,
- firstnumber=380,linerange={380-392},numbers=left
+ firstnumber=382,linerange={382-394},
+ numbers=left,
}
\lstdefinestyle{paragraphsStopAt}{
style=yaml-LST,
- firstnumber=393,linerange={393-401},numbers=left
+ firstnumber=395,linerange={395-403},
+ numbers=left,
}
\lstdefinestyle{modifylinebreaksEnv}{
style=yaml-LST,
- firstnumber=402,linerange={402-411},numbers=left
+ firstnumber=404,linerange={404-413},
+ numbers=left,
}
% stars around contributors
@@ -515,7 +539,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.1
+ \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.2
\end{tcolorbox}
}
\author{Chris Hughes \thanks{and contributors! See \vref{sec:contributors}. For
@@ -552,7 +576,6 @@
\input{subsubsec-no-add-remaining-code-blocks}
\stopcontents[noAdditionalIndent]
\input{subsec-commands-and-their-options}
-\clearpage
\input{sec-the-m-switch}
\input{subsec-partnering-poly-switches}
\input{subsec-conflicting-poly-switches}
@@ -560,17 +583,3 @@
\input{references}
\input{appendices}
\end{document}
-
-\subsection{The phases of \texttt{latexindent.pl}}
- With these rules in mind, let's study a few test cases:
-
- latexindent.pl environments-line-break-conflict.tex -s -t -m -o environments-line-break-conflict-mod1.tex -l=env-conflicts-mod1.yaml
- latexindent.pl environments-line-break-conflict-nested.tex -s -t -m -o environments-line-break-conflict-nested-mod-2.tex -l=env-conflicts-mod2.yaml
- latexindent.pl environments-line-break-conflict-nested.tex -s -t -m -o environments-line-break-conflict-nested-mod-3.tex -l=env-conflicts-mod3.yaml
- environments-first-opt-args.tex, see all of the different examples in test-cases.sh
- environments-second-opt-args.tex provides some interesting cases too
-
- The \lstinline!\fi! command knows to insert a space, so as to give, for example, \lstinline!\fi! text, and avoid things such as \lstinline!\fitext!
-
- from yaml
-
diff --git a/Master/texmf-dist/doc/support/latexindent/sec-default-user-local.tex b/Master/texmf-dist/doc/support/latexindent/sec-default-user-local.tex
index f8bf01b60fb..ff99480cc80 100644
--- a/Master/texmf-dist/doc/support/latexindent/sec-default-user-local.tex
+++ b/Master/texmf-dist/doc/support/latexindent/sec-default-user-local.tex
@@ -235,7 +235,8 @@ lookForAlignDelims:
\cmhlistingsfromfile[style=yaml-LST]{demonstrations/tabular.yaml}[yaml-TCB]{\texttt{tabular.yaml}}{lst:aligndelims:advanced}
Note that you can use a mixture of the basic and advanced form: in \cref{lst:aligndelims:advanced} \texttt{tabular} and \texttt{tabularx}
- are advanced and \texttt{longtable} is basic. When using the advanced form, each field should receive at least 1 sub-field, and \emph{can} (but does not have to) receive up to 3 fields:
+ are advanced and \texttt{longtable} is basic. When using the advanced form, each field should receive at least 1 sub-field, and \emph{can}
+ (but does not have to) receive any of the following fields:
\begin{itemize}
\item \texttt{delims}: switch equivalent to simply specifying, for example, \texttt{tabular: 1} in
the basic version shown in \cref{lst:aligndelims:basic} (default: 1);
@@ -243,6 +244,10 @@ lookForAlignDelims:
\item \texttt{spacesBeforeDoubleBackSlash}: optionally, specifies the number of spaces to be inserted
before (non-aligned) \lstinline!\\!. In order to use this field, \texttt{alignDoubleBackSlash} needs
to be set to 0 (default: 0).
+ \item \texttt{multiColumnGrouping}: details if \texttt{latexindent.pl} should group columns
+ underneath a \lstinline!\multicolumn! command (default: 0);
+ \item \texttt{alignRowsWithoutMaxDelims}: details if rows that do not contain the
+ maximum number of delimeters should be formatted so as to have the ampersands aligned (default: 1).
\end{itemize}
Assuming that you have the settings in \cref{lst:aligndelims:advanced} saved in \texttt{tabular.yaml}, and the code
@@ -276,6 +281,44 @@ latexindent.pl -l tabular1.yaml tabular1.tex
\cmhlistingsfromfile[style=yaml-LST]{demonstrations/tabular1.yaml}[yaml-TCB]{\texttt{tabular1.yaml}}{lst:tabular1YAML}
\end{minipage}%
+ Now consider the file \texttt{tabular2.tex} in \cref{lst:tabular2}, which contains a \lstinline!\multicolumn! command, and
+ the YAML files in \cref{lst:tabular2YAML,lst:tabular3YAML}.
+
+ \cmhlistingsfromfile*[showspaces=false,showtabs=false]{demonstrations/tabular2.tex}{\texttt{tabular2.tex}}{lst:tabular2}
+ \begin{minipage}{.45\textwidth}
+ \cmhlistingsfromfile[style=yaml-LST]{demonstrations/tabular2.yaml}[yaml-TCB]{\texttt{tabular2.yaml}}{lst:tabular2YAML}
+ \end{minipage}%
+ \hfill
+ \begin{minipage}{.45\textwidth}
+ \cmhlistingsfromfile[style=yaml-LST]{demonstrations/tabular3.yaml}[yaml-TCB]{\texttt{tabular3.yaml}}{lst:tabular3YAML}
+ \end{minipage}%
+
+ On running the commands
+ \begin{commandshell}
+latexindent.pl tabular2.tex
+latexindent.pl -s tabular2.tex -l tabular2.yaml
+latexindent.pl -s tabular2.tex -l tabular3.yaml
+ \end{commandshell}
+ we obtain the respective outputs given in \cref{lst:tabular2-default,lst:tabular2-mc,lst:tabular2-no-max}.
+
+ \begin{widepage}
+ \cmhlistingsfromfile*[showspaces=false,showtabs=false]{demonstrations/tabular2-default.tex}{\texttt{tabular2-default.tex}}{lst:tabular2-default}
+ \cmhlistingsfromfile*[showspaces=false,showtabs=false]{demonstrations/tabular2-mc.tex}{\texttt{tabular2-mc.tex}}{lst:tabular2-mc}
+ \cmhlistingsfromfile*[showspaces=false,showtabs=false]{demonstrations/tabular2-no-max.tex}{\texttt{tabular2-no-max.tex}}{lst:tabular2-no-max}
+ \end{widepage}
+
+ Notice in particular:
+ \begin{itemize}
+ \item in both \cref{lst:tabular2-default,lst:tabular2-mc} all rows have been aligned at the ampersand, even
+ those that do not contain the maximum number of ampersands (3 ampersands, in this case);
+ \item in \cref{lst:tabular2-default} the columns have been aligned at the ampersand;
+ \item in \cref{lst:tabular2-mc} the \lstinline!\multicolumn! command has grouped the $2$ columns beneath \emph{and} above it,
+ because \texttt{multiColumnGrouping} is set to $1$ in \cref{lst:tabular2YAML};
+ \item in \cref{lst:tabular2-no-max} rows~3 and~6 have \emph{not} been aligned at the ampersand, because
+ \texttt{alignRowsWithoutMaxDelims} has been to set to $0$ in \cref{lst:tabular3YAML}; however,
+ the \lstinline!\\! \emph{have} still been aligned.
+ \end{itemize}
+
As of Version 3.0, the alignment routine works on mandatory and optional arguments within commands, and also within `special' code blocks
(see \texttt{specialBeginEnd} on \cpageref{yaml:specialBeginEnd}); for example, assuming that you have a command called \lstinline!\matrix!
and that it is populated within \texttt{lookForAlignDelims} (which it is, by default), and that you
@@ -426,7 +469,7 @@ latexindent.pl headings1.tex -l=headings1.yaml
of these are shown in \cref{tab:code-blocks}.
\begin{longtable}{m{.3\linewidth}@{\hspace{.25cm}}m{.4\linewidth}@{}m{.2\linewidth}}
- \caption{Code blocks known to \texttt{latexindent.pl}}\label{tab:code-blocks}\\
+ \caption{Code blocks known to \texttt{latexindent.pl}}\label{tab:code-blocks} \\
\toprule
Code block & characters allowed in name & example \\
\midrule
@@ -462,31 +505,31 @@ mand arg text
\else
...
\fi
- \end{lstlisting}\\\cmidrule{2-3}
+ \end{lstlisting} \\\cmidrule{2-3}
items & User specified, see \vref{lst:indentafteritems,lst:itemNames} &
\begin{lstlisting}[,nolol=true,]
\begin{enumerate}
\item ...
\end{enumerate}
- \end{lstlisting}\\\cmidrule{2-3}
+ \end{lstlisting} \\\cmidrule{2-3}
specialBeginEnd & User specified, see \vref{lst:specialBeginEnd} &
\begin{lstlisting}[,nolol=true,]
\[
...
\]
- \end{lstlisting}\\\cmidrule{2-3}
+ \end{lstlisting} \\\cmidrule{2-3}
afterHeading & User specified, see \vref{lst:indentAfterHeadings} &
\begin{lstlisting}[,morekeywords={chapter},nolol=true,]
\chapter{title}
...
\section{title}
- \end{lstlisting}\\\cmidrule{2-3}
+ \end{lstlisting} \\\cmidrule{2-3}
filecontents & User specified, see \vref{lst:fileContentsEnvironments} &
\begin{lstlisting}[,nolol=true,]
\begin{filecontents}
...
\end{filecontents}
- \end{lstlisting}\\
+ \end{lstlisting} \\
\bottomrule
\end{longtable}
diff --git a/Master/texmf-dist/doc/support/latexindent/sec-the-m-switch.tex b/Master/texmf-dist/doc/support/latexindent/sec-the-m-switch.tex
index 7e8ddcd50fd..091f9154203 100644
--- a/Master/texmf-dist/doc/support/latexindent/sec-the-m-switch.tex
+++ b/Master/texmf-dist/doc/support/latexindent/sec-the-m-switch.tex
@@ -670,11 +670,11 @@ latexindent.pl -m env-mlb6.tex -l env-mlb9.yaml,env-mlb10.yaml,env-mlb11.yaml,en
modified using \texttt{latexindent.pl}.
\begin{longtable}{m{.2\textwidth}@{\hspace{.75cm}}m{.35\textwidth}@{}m{.4\textwidth}}
- \caption{Poly-switch mappings for all code-block types}\label{tab:poly-switch-mapping}\\
+ \caption{Poly-switch mappings for all code-block types}\label{tab:poly-switch-mapping} \\
\toprule
- Code block & Sample & Poly-switch mapping \\
+ Code block & Sample & Poly-switch mapping \\
\midrule
- environment &
+ environment &
\begin{lstlisting}[escapeinside={(*@}{@*)},nolol=true]
before words(*@$\BeginStartsOnOwnLine$@*)
\begin{myenv}(*@$\BodyStartsOnOwnLine$@*)
@@ -682,7 +682,7 @@ body of myenv(*@$\EndStartsOnOwnLine$@*)
\end{myenv}(*@$\EndFinishesWithLineBreak$@*)
after words
\end{lstlisting}
- &
+ &
\begin{tabular}[t]{c@{~}l@{}}
$\BeginStartsOnOwnLine$ & BeginStartsOnOwnLine \\
$\BodyStartsOnOwnLine$ & BodyStartsOnOwnLine \\
@@ -691,7 +691,7 @@ after words
\end{tabular}
\\
\cmidrule{2-3}
- ifelsefi &
+ ifelsefi &
\begin{lstlisting}[escapeinside={(*@}{@*)},nolol=true]
before words(*@$\BeginStartsOnOwnLine$@*)
\if...(*@$\BodyStartsOnOwnLine$@*)
@@ -701,7 +701,7 @@ body of else statement(*@$\EndStartsOnOwnLine$@*)
\fi(*@$\EndFinishesWithLineBreak$@*)
after words
\end{lstlisting}
- &
+ &
\begin{tabular}[t]{c@{~}l@{}}
$\BeginStartsOnOwnLine$ & IfStartsOnOwnLine \\
$\BodyStartsOnOwnLine$ & BodyStartsOnOwnLine \\
@@ -712,7 +712,7 @@ after words
\end{tabular}
\\
\cmidrule{2-3}
- optionalArguments &
+ optionalArguments &
\begin{lstlisting}[escapeinside={(*@}{@*)},nolol=true]
...(*@$\BeginStartsOnOwnLine$@*)
[(*@$\BodyStartsOnOwnLine$@*)
@@ -720,7 +720,7 @@ body of opt arg(*@$\EndStartsOnOwnLine$@*)
](*@$\EndFinishesWithLineBreak$@*)
...
\end{lstlisting}
- &
+ &
\begin{tabular}[t]{c@{~}l@{}}
$\BeginStartsOnOwnLine$ & LSqBStartsOnOwnLine\footnote{LSqB stands for Left Square Bracket} \\
$\BodyStartsOnOwnLine$ & OptArgBodyStartsOnOwnLine \\
@@ -729,7 +729,7 @@ body of opt arg(*@$\EndStartsOnOwnLine$@*)
\end{tabular}
\\
\cmidrule{2-3}
- mandatoryArguments &
+ mandatoryArguments &
\begin{lstlisting}[escapeinside={(*@}{@*)},nolol=true]
...(*@$\BeginStartsOnOwnLine$@*)
{(*@$\BodyStartsOnOwnLine$@*)
@@ -737,7 +737,7 @@ body of mand arg(*@$\EndStartsOnOwnLine$@*)
}(*@$\EndFinishesWithLineBreak$@*)
...
\end{lstlisting}
- &
+ &
\begin{tabular}[t]{c@{~}l@{}}
$\BeginStartsOnOwnLine$ & LCuBStartsOnOwnLine\footnote{LCuB stands for Left Curly Brace} \\
$\BodyStartsOnOwnLine$ & MandArgBodyStartsOnOwnLine \\
@@ -746,26 +746,26 @@ body of mand arg(*@$\EndStartsOnOwnLine$@*)
\end{tabular}
\\
\cmidrule{2-3}
- commands &
+ commands &
\begin{lstlisting}[escapeinside={(*@}{@*)},morekeywords={mycommand},nolol=true,]
before words(*@$\BeginStartsOnOwnLine$@*)
\mycommand(*@$\BodyStartsOnOwnLine$@*)
(*@$\langle$\itshape{arguments}$\rangle$@*)
\end{lstlisting}
- &
+ &
\begin{tabular}[t]{c@{~}l@{}}
$\BeginStartsOnOwnLine$ & CommandStartsOnOwnLine \\
$\BodyStartsOnOwnLine$ & CommandNameFinishesWithLineBreak \\
\end{tabular}
\\
\cmidrule{2-3}
- namedGroupingBraces Brackets &
+ namedGroupingBraces Brackets &
\begin{lstlisting}[escapeinside={(*@}{@*)},morekeywords={myname},nolol=true,]
before words(*@$\BeginStartsOnOwnLine$@*)
myname(*@$\BodyStartsOnOwnLine$@*)
(*@$\langle$\itshape{braces/brackets}$\rangle$@*)
\end{lstlisting}
- &
+ &
\begin{tabular}[t]{c@{~}l@{}}
$\BeginStartsOnOwnLine$ & NameStartsOnOwnLine \\
$\BodyStartsOnOwnLine$ & NameFinishesWithLineBreak \\
@@ -778,7 +778,7 @@ before words(*@$\BeginStartsOnOwnLine$@*)
key(*@$\EqualsStartsOnOwnLine$@*)=(*@$\BodyStartsOnOwnLine$@*)
(*@$\langle$\itshape{braces/brackets}$\rangle$@*)
\end{lstlisting}
- &
+ &
\begin{tabular}[t]{c@{~}l@{}}
$\BeginStartsOnOwnLine$ & KeyStartsOnOwnLine \\
$\EqualsStartsOnOwnLine$ & EqualsStartsOnOwnLine \\
@@ -786,20 +786,20 @@ key(*@$\EqualsStartsOnOwnLine$@*)=(*@$\BodyStartsOnOwnLine$@*)
\end{tabular}
\\
\cmidrule{2-3}
- items &
+ items &
\begin{lstlisting}[escapeinside={(*@}{@*)},nolol=true]
before words(*@$\BeginStartsOnOwnLine$@*)
\item(*@$\BodyStartsOnOwnLine$@*)
...
\end{lstlisting}
- &
+ &
\begin{tabular}[t]{c@{~}l@{}}
$\BeginStartsOnOwnLine$ & ItemStartsOnOwnLine \\
$\BodyStartsOnOwnLine$ & ItemFinishesWithLineBreak \\
\end{tabular}
\\
\cmidrule{2-3}
- specialBeginEnd &
+ specialBeginEnd &
\begin{lstlisting}[escapeinside={(*@}{@*)},nolol=true]
before words(*@$\BeginStartsOnOwnLine$@*)
\[(*@$\BodyStartsOnOwnLine$@*)
@@ -807,7 +807,7 @@ body of special(*@$\EndStartsOnOwnLine$@*)
\](*@$\EndFinishesWithLineBreak$@*)
after words
\end{lstlisting}
- &
+ &
\begin{tabular}[t]{c@{~}l@{}}
$\BeginStartsOnOwnLine$ & SpecialBeginStartsOnOwnLine \\
$\BodyStartsOnOwnLine$ & SpecialBodyStartsOnOwnLine \\
diff --git a/Master/texmf-dist/doc/support/latexindent/subsubsec-no-add-remaining-code-blocks.tex b/Master/texmf-dist/doc/support/latexindent/subsubsec-no-add-remaining-code-blocks.tex
index 42794f11f71..7c1302bdc53 100644
--- a/Master/texmf-dist/doc/support/latexindent/subsubsec-no-add-remaining-code-blocks.tex
+++ b/Master/texmf-dist/doc/support/latexindent/subsubsec-no-add-remaining-code-blocks.tex
@@ -37,7 +37,7 @@
This type of code block is mostly motivated by tikz-based code; we define this code block as follows:
\begin{itemize}
\item it must immediately follow either \emph{horizontal space} OR \emph{one or more line breaks} OR \lstinline!{! OR \lstinline![!
- OR \lstinline!$!;
+ OR \lstinline!$! OR \lstinline!)! OR \lstinline!(!;
\item the name may contain the characters detailed in \vref{tab:code-blocks};
\item then at least one set of curly braces or square brackets (comments and line breaks allowed throughout).
\end{itemize}