From 1db3b2536091531ed7d3ca49a6d114bb4944eb03 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Jun 2022 20:32:20 +0000 Subject: latexindent (13jun22) git-svn-id: svn://tug.org/texlive/trunk@63581 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/support/latexindent/README | 2 +- .../latexindent/latexindent-yaml-schema.json | 2 +- .../doc/support/latexindent/latexindent.pdf | Bin 1104377 -> 1106074 bytes .../doc/support/latexindent/sec-appendices.tex | 64 ++++++++++++++++++++- .../doc/support/latexindent/sec-how-to-use.tex | 5 ++ .../doc/support/latexindent/sec-introduction.tex | 32 +++++------ .../latexindent/subsec-one-sentence-per-line.tex | 4 +- .../doc/support/latexindent/subsec-text-wrap.tex | 24 ++++---- .../texmf-dist/doc/support/latexindent/title.tex | 4 +- .../scripts/latexindent/LatexIndent/Version.pm | 4 +- .../scripts/latexindent/defaultSettings.yaml | 2 +- .../texmf-dist/scripts/latexindent/latexindent.pl | 2 +- 12 files changed, 104 insertions(+), 41 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/support/latexindent/README b/Master/texmf-dist/doc/support/latexindent/README index 9a6c7d27185..7a48e5607f8 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.17.3, 2022-06-05 + latexindent.pl, version 3.18, 2022-06-12 PERL script to indent code within environments, and align delimited environments in .tex files. diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json b/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json index 47b70ecf994..8fe129d18a1 100644 --- a/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json +++ b/Master/texmf-dist/doc/support/latexindent/latexindent-yaml-schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/schema", "$id": "latexindent-yaml-schema.json", "title": "latexindent.pl YAML schema", - "description": "latexindent.pl YAML schema helper, V3.17.3 2022-06-05", + "description": "latexindent.pl YAML schema helper, V3.18 2022-06-12", "type": "object", "properties": { "fileExtensionPreference": { diff --git a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf index 323e4716d27..04b5d2ef382 100644 Binary files a/Master/texmf-dist/doc/support/latexindent/latexindent.pdf and b/Master/texmf-dist/doc/support/latexindent/latexindent.pdf differ diff --git a/Master/texmf-dist/doc/support/latexindent/sec-appendices.tex b/Master/texmf-dist/doc/support/latexindent/sec-appendices.tex index 03a2961cc6f..84dd9d56f79 100644 --- a/Master/texmf-dist/doc/support/latexindent/sec-appendices.tex +++ b/Master/texmf-dist/doc/support/latexindent/sec-appendices.tex @@ -107,7 +107,6 @@ sudo pacman -S perl cpanminus these details. \begin{cmhlistings}[style=tcblatex,language=Bash]{\texttt{alpine-install.sh}}{lst:alpine-install} - # Installing perl apk --no-cache add miniperl perl-utils @@ -377,7 +376,7 @@ latexindent.pl myfile*.tex --check \begin{commandshell} conda install latexindent.pl -c conda-forge \end{commandshell} - this will install the executable and all its dependencies (including perl) in the + This will install the executable and all its dependencies (including perl) in the activate environment. You don't even have to worry about \texttt{defaultSettings.yaml} as it included too, you can thus skip \cref{sec:requiredmodules,sec:updating-path}. \index{conda} @@ -397,6 +396,39 @@ conda run latexindent.pl -vv \end{commandshell} I found the details given at \cite{condainstallhelp} to be helpful. + \section{Using docker}\label{sec:app:docker} + If you use docker you'll only need \announce*{2022-06-12}{docker support} + \begin{commandshell} +docker pull ghcr.io/cmhughes/latexindent.pl +\end{commandshell} + This will download the image packed \texttt{latexindent}'s executable and its all + dependencies. \index{docker} Thank you to \cite{eggplants} for contributing this feature; + see also \cite{cmhughesio}. For reference, \emph{ghcr} stands for \emph{GitHub Container + Repository}. + + \subsection{Sample docker installation on Ubuntu} + To pull the image and show \texttt{latexindent}'s help on Ubuntu: + + \begin{cmhlistings}*[style=tcblatex,language=Bash]{\texttt{docker-install.sh}}{lst:docker-install} +# setup docker if not already installed +if ! command -v docker &> /dev/null; then + sudo apt install docker.io -y + sudo groupadd docker + sudo gpasswd -a "$USER" docker + sudo systemctl restart docker +fi + +# download image and execute +docker pull ghcr.io/cmhughes/latexindent.pl +docker run ghcr.io/cmhughes/latexindent.pl -h +\end{cmhlistings} + + \subsection{How to format on Docker} + When you use \texttt{latexindent} with the docker image, you have to mount target \texttt{tex} file like this: + \begin{commandshell} +docker run -v /path/to/local/myfile.tex:/myfile.tex ghcr.io/cmhughes/latexindent.pl -s -w myfile.tex +\end{commandshell} + \section{pre-commit} Users of \texttt{.git} may be interested \announce{2022-01-21}{pre-commit for @@ -425,7 +457,7 @@ export PATH=$PATH:/home/cmhughes/.local/bin The default values that are employed by \texttt{pre-commit} are shown in \cref{lst:.pre-commit-yaml-default}. \index{pre-commit!default} - \cmhlistingsfromfile{../.pre-commit-hooks.yaml}[yaml-TCB]{\texttt{.pre-commit-hooks.yaml} (default)}{lst:.pre-commit-yaml-default} + \cmhlistingsfromfile*{../.pre-commit-hooks.yaml}[yaml-TCB]{\texttt{.pre-commit-hooks.yaml} (default)}{lst:.pre-commit-yaml-default} In particular, the decision has deliberately been made (in collaboration with \cite{holzhausprecommit}) to have the default to employ the following switches: @@ -489,6 +521,32 @@ pre-commit run --all-files \cref{lst:.pre-commit-config.yaml-cpan} are equivalent to calling \begin{commandshell} conda run latexindent.pl -s myfile.tex +\end{commandshell} + for each \texttt{.tex} file in your repository; + \item to instruct \texttt{latexindent.pl} to overwrite the files in your repository, then you + can update \cref{lst:.pre-commit-config.yaml-cpan} so that \texttt{args: [-s, -w]}. + \end{itemize} + + \subsection{pre-commit using docker}\label{sec:pre-commit-docker} + + You can also rely on \texttt{docker} (detailed in \cref{sec:app:docker}) instead of + \texttt{CPAN} for all dependencies, including \texttt{latexindent.pl} itself. + \index{docker} \index{git} \index{pre-commit!docker} + + \cmhlistingsfromfile*{demonstrations/pre-commit-config-docker.yaml}[yaml-TCB]{\texttt{.pre-commit-config.yaml} (docker)}{lst:.pre-commit-config.yaml-docker} + Once created, you should then be able to run the following command: + \begin{commandshell} +pre-commit run --all-files +\end{commandshell} + A few notes about \cref{lst:.pre-commit-config.yaml-cpan}: + \begin{itemize} + \item the settings given in \cref{lst:.pre-commit-config.yaml-docker} instruct + \texttt{pre-commit} to use \texttt{docker} to get dependencies; + \item this requires \texttt{pre-commit} and \texttt{docker} to be installed on your system; + \item the \texttt{args} lists selected command-line options; the settings in + \cref{lst:.pre-commit-config.yaml-cpan} are equivalent to calling + \begin{commandshell} +docker run -v /path/to/myfile.tex:/myfile.tex ghcr.io/cmhughes/latexindent.pl -s myfile.tex \end{commandshell} for each \texttt{.tex} file in your repository; \item to instruct \texttt{latexindent.pl} to overwrite the files in your repository, then you diff --git a/Master/texmf-dist/doc/support/latexindent/sec-how-to-use.tex b/Master/texmf-dist/doc/support/latexindent/sec-how-to-use.tex index c8db5d20d1c..d721aa9dd63 100644 --- a/Master/texmf-dist/doc/support/latexindent/sec-how-to-use.tex +++ b/Master/texmf-dist/doc/support/latexindent/sec-how-to-use.tex @@ -35,6 +35,11 @@ \subsubsection{conda users} Users of \texttt{conda} should see the details given in \cref{sec:app:conda}. + \index{conda} + +\subsubsection{docker users} + Users of \texttt{docker} should see the details given in \cref{sec:app:docker}. + \index{docker} \subsection{From the command line}\label{sec:commandline} \texttt{latexindent.pl} has a number of different switches/flags/options, which diff --git a/Master/texmf-dist/doc/support/latexindent/sec-introduction.tex b/Master/texmf-dist/doc/support/latexindent/sec-introduction.tex index 5920a176b48..83db4317c21 100644 --- a/Master/texmf-dist/doc/support/latexindent/sec-introduction.tex +++ b/Master/texmf-dist/doc/support/latexindent/sec-introduction.tex @@ -62,7 +62,7 @@ latexindent.pl myfile.tex no explanation in this section, which is deliberate for a quick start. The rest of the manual is more verbose. - \cmhlistingsfromfile*{demonstrations/quick-start.tex}{\texttt{quick-start.tex}}{lst:quick-start} + \cmhlistingsfromfile{demonstrations/quick-start.tex}{\texttt{quick-start.tex}}{lst:quick-start} Running \begin{commandshell} @@ -70,7 +70,7 @@ latexindent.pl quick-start.tex \end{commandshell} gives \cref{lst:quick-start-default}. - \cmhlistingsfromfile*{demonstrations/quick-start-default.tex}{\texttt{quick-start-default.tex}}{lst:quick-start-default} + \cmhlistingsfromfile{demonstrations/quick-start-default.tex}{\texttt{quick-start-default.tex}}{lst:quick-start-default} \begin{example} Running @@ -80,8 +80,8 @@ latexindent.pl -l quick-start1.yaml quick-start.tex gives \cref{lst:quick-start-mod1}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/quick-start1.yaml}[yaml-TCB]{\texttt{quick-start1.yaml}}{lst:quick-start1yaml} - \cmhlistingsfromfile*[showspaces=true]{demonstrations/quick-start-mod1.tex}{\texttt{quick-start-mod1.tex}}{lst:quick-start-mod1} + \cmhlistingsfromfile{demonstrations/quick-start1.yaml}[yaml-TCB]{\texttt{quick-start1.yaml}}{lst:quick-start1yaml} + \cmhlistingsfromfile[showspaces=true]{demonstrations/quick-start-mod1.tex}{\texttt{quick-start-mod1.tex}}{lst:quick-start-mod1} \end{cmhtcbraster} \end{example} @@ -93,8 +93,8 @@ latexindent.pl -l quick-start2.yaml quick-start.tex gives \cref{lst:quick-start-mod2}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/quick-start2.yaml}[yaml-TCB]{\texttt{quick-start2.yaml}}{lst:quick-start2yaml} - \cmhlistingsfromfile*[showspaces=true]{demonstrations/quick-start-mod2.tex}{\texttt{quick-start-mod2.tex}}{lst:quick-start-mod2} + \cmhlistingsfromfile{demonstrations/quick-start2.yaml}[yaml-TCB]{\texttt{quick-start2.yaml}}{lst:quick-start2yaml} + \cmhlistingsfromfile[showspaces=true]{demonstrations/quick-start-mod2.tex}{\texttt{quick-start-mod2.tex}}{lst:quick-start-mod2} \end{cmhtcbraster} \end{example} @@ -106,8 +106,8 @@ latexindent.pl -l quick-start3.yaml quick-start.tex gives \cref{lst:quick-start-mod3}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/quick-start3.yaml}[yaml-TCB]{\texttt{quick-start3.yaml}}{lst:quick-start3yaml} - \cmhlistingsfromfile*{demonstrations/quick-start-mod3.tex}{\texttt{quick-start-mod3.tex}}{lst:quick-start-mod3} + \cmhlistingsfromfile{demonstrations/quick-start3.yaml}[yaml-TCB]{\texttt{quick-start3.yaml}}{lst:quick-start3yaml} + \cmhlistingsfromfile{demonstrations/quick-start-mod3.tex}{\texttt{quick-start-mod3.tex}}{lst:quick-start-mod3} \end{cmhtcbraster} \end{example} @@ -119,8 +119,8 @@ latexindent.pl -m -l quick-start4.yaml quick-start.tex gives \cref{lst:quick-start-mod4}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/quick-start4.yaml}[MLB-TCB]{\texttt{quick-start4.yaml}}{lst:quick-start4yaml} - \cmhlistingsfromfile*{demonstrations/quick-start-mod4.tex}{\texttt{quick-start-mod4.tex}}{lst:quick-start-mod4} + \cmhlistingsfromfile{demonstrations/quick-start4.yaml}[MLB-TCB]{\texttt{quick-start4.yaml}}{lst:quick-start4yaml} + \cmhlistingsfromfile{demonstrations/quick-start-mod4.tex}{\texttt{quick-start-mod4.tex}}{lst:quick-start-mod4} \end{cmhtcbraster} Full details of text wrapping in \cref{subsec:textwrapping}. \end{example} @@ -133,8 +133,8 @@ latexindent.pl -m -l quick-start5.yaml quick-start.tex gives \cref{lst:quick-start-mod5}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/quick-start5.yaml}[MLB-TCB]{\texttt{quick-start5.yaml}}{lst:quick-start5yaml} - \cmhlistingsfromfile*{demonstrations/quick-start-mod5.tex}{\texttt{quick-start-mod5.tex}}{lst:quick-start-mod5} + \cmhlistingsfromfile{demonstrations/quick-start5.yaml}[MLB-TCB]{\texttt{quick-start5.yaml}}{lst:quick-start5yaml} + \cmhlistingsfromfile{demonstrations/quick-start-mod5.tex}{\texttt{quick-start-mod5.tex}}{lst:quick-start-mod5} \end{cmhtcbraster} Full details of text wrapping in \cref{subsec:textwrapping}. \end{example} @@ -147,8 +147,8 @@ latexindent.pl -m -l quick-start6.yaml quick-start.tex gives \cref{lst:quick-start-mod6}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/quick-start6.yaml}[MLB-TCB]{\texttt{quick-start6.yaml}}{lst:quick-start6yaml} - \cmhlistingsfromfile*{demonstrations/quick-start-mod6.tex}{\texttt{quick-start-mod6.tex}}{lst:quick-start-mod6} + \cmhlistingsfromfile{demonstrations/quick-start6.yaml}[MLB-TCB]{\texttt{quick-start6.yaml}}{lst:quick-start6yaml} + \cmhlistingsfromfile{demonstrations/quick-start-mod6.tex}{\texttt{quick-start-mod6.tex}}{lst:quick-start-mod6} \end{cmhtcbraster} This is an example of a \emph{poly-switch}; full details of \emph{poly-switches} are covered in \cref{sec:poly-switches}. @@ -162,8 +162,8 @@ latexindent.pl -m -l quick-start7.yaml quick-start.tex gives \cref{lst:quick-start-mod7}. \begin{cmhtcbraster} - \cmhlistingsfromfile*{demonstrations/quick-start7.yaml}[MLB-TCB]{\texttt{quick-start7.yaml}}{lst:quick-start7yaml} - \cmhlistingsfromfile*{demonstrations/quick-start-mod7.tex}{\texttt{quick-start-mod7.tex}}{lst:quick-start-mod7} + \cmhlistingsfromfile{demonstrations/quick-start7.yaml}[MLB-TCB]{\texttt{quick-start7.yaml}}{lst:quick-start7yaml} + \cmhlistingsfromfile{demonstrations/quick-start-mod7.tex}{\texttt{quick-start-mod7.tex}}{lst:quick-start-mod7} \end{cmhtcbraster} Full details of \emph{poly-switches} are covered in \cref{sec:poly-switches}. \end{example} diff --git a/Master/texmf-dist/doc/support/latexindent/subsec-one-sentence-per-line.tex b/Master/texmf-dist/doc/support/latexindent/subsec-one-sentence-per-line.tex index fd16d193be7..352697735f2 100644 --- a/Master/texmf-dist/doc/support/latexindent/subsec-one-sentence-per-line.tex +++ b/Master/texmf-dist/doc/support/latexindent/subsec-one-sentence-per-line.tex @@ -56,7 +56,7 @@ latexindent.pl multiple-sentences -m -l=keep-sen-line-breaks.yaml but have not been removed in \cref{lst:multiple-sentences-mod2}. \yamltitle{multipleSpacesToSingle}{0|1} - \announce*{2022-03-25}*{multipleSpacesToSingle for oneSentencePerLine} By default, the + \announce{2022-03-25}*{multipleSpacesToSingle for oneSentencePerLine} By default, the one-sentence-per-line routine will convert multiple spaces into single spaces. You can change this behaviour by changing the switch \texttt{multipleSpacesToSingle} to a value of \texttt{0}. @@ -375,6 +375,6 @@ latexindent.pl multiple-sentences6 -m -l=sentence-wrap1.yaml,itemize.yaml Notice that the sentence has received indentation, and that the \texttt{itemize} code block has been found and indented correctly. - Text \announce*{2022-04-04}*{oneSentencePerLine text wrapping update} wrapping when using + Text \announce{2022-04-04}*{oneSentencePerLine text wrapping update} wrapping when using the \texttt{oneSentencePerLine} routine determines if it will remove line breaks while text wrapping, from the value of \texttt{removeSentenceLineBreaks}. diff --git a/Master/texmf-dist/doc/support/latexindent/subsec-text-wrap.tex b/Master/texmf-dist/doc/support/latexindent/subsec-text-wrap.tex index fddbffd98b8..e17188267a6 100644 --- a/Master/texmf-dist/doc/support/latexindent/subsec-text-wrap.tex +++ b/Master/texmf-dist/doc/support/latexindent/subsec-text-wrap.tex @@ -374,8 +374,8 @@ latexindent.pl -m tw-tc1.tex -l textwrap1A.yaml -o=+-mod1 gives the output given in \cref{lst:tw-tc1-mod1}. \begin{cmhtcbraster}[raster column skip=.1\linewidth] - \cmhlistingsfromfile*[showspaces=true]{demonstrations/tw-tc1.tex}{\texttt{tw-tc1.tex}}{lst:tw-tc1} - \cmhlistingsfromfile*{demonstrations/tw-tc1-mod1.tex}{\texttt{tw-tc1-mod1.tex}}{lst:tw-tc1-mod1} + \cmhlistingsfromfile[showspaces=true]{demonstrations/tw-tc1.tex}{\texttt{tw-tc1.tex}}{lst:tw-tc1} + \cmhlistingsfromfile{demonstrations/tw-tc1-mod1.tex}{\texttt{tw-tc1-mod1.tex}}{lst:tw-tc1-mod1} \end{cmhtcbraster} \end{example} @@ -389,8 +389,8 @@ latexindent.pl -m tw-tc2.tex -l textwrap1A.yaml -o=+-mod1 \end{commandshell} gives the output in \cref{lst:tw-tc2-mod1}. \begin{cmhtcbraster}[raster column skip=.1\linewidth] - \cmhlistingsfromfile*{demonstrations/tw-tc2.tex}{\texttt{tw-tc2.tex}}{lst:tw-tc2} - \cmhlistingsfromfile*{demonstrations/tw-tc2-mod1.tex}{\texttt{tw-tc2-mod1.tex}}{lst:tw-tc2-mod1} + \cmhlistingsfromfile{demonstrations/tw-tc2.tex}{\texttt{tw-tc2.tex}}{lst:tw-tc2} + \cmhlistingsfromfile{demonstrations/tw-tc2-mod1.tex}{\texttt{tw-tc2-mod1.tex}}{lst:tw-tc2-mod1} \end{cmhtcbraster} We note that, because there is \emph{not} a space before the trailing comment, that the lines have been joined \emph{without} a space. @@ -405,8 +405,8 @@ latexindent.pl -m tw-tc3.tex -l textwrap1A.yaml -o=+-mod1 \end{commandshell} gives the output in \cref{lst:tw-tc3-mod1}. \begin{cmhtcbraster}[raster column skip=.1\linewidth] - \cmhlistingsfromfile*{demonstrations/tw-tc3.tex}{\texttt{tw-tc3.tex}}{lst:tw-tc3} - \cmhlistingsfromfile*{demonstrations/tw-tc3-mod1.tex}{\texttt{tw-tc3-mod1.tex}}{lst:tw-tc3-mod1} + \cmhlistingsfromfile{demonstrations/tw-tc3.tex}{\texttt{tw-tc3.tex}}{lst:tw-tc3} + \cmhlistingsfromfile{demonstrations/tw-tc3-mod1.tex}{\texttt{tw-tc3-mod1.tex}}{lst:tw-tc3-mod1} \end{cmhtcbraster} \end{example} @@ -419,8 +419,8 @@ latexindent.pl -m tw-tc4.tex -l textwrap1A.yaml -o=+-mod1 \end{commandshell} gives the output in \cref{lst:tw-tc4-mod1}. \begin{cmhtcbraster}[raster column skip=.1\linewidth] - \cmhlistingsfromfile*{demonstrations/tw-tc4.tex}{\texttt{tw-tc4.tex}}{lst:tw-tc4} - \cmhlistingsfromfile*{demonstrations/tw-tc4-mod1.tex}{\texttt{tw-tc4-mod1.tex}}{lst:tw-tc4-mod1} + \cmhlistingsfromfile{demonstrations/tw-tc4.tex}{\texttt{tw-tc4.tex}}{lst:tw-tc4} + \cmhlistingsfromfile{demonstrations/tw-tc4-mod1.tex}{\texttt{tw-tc4-mod1.tex}}{lst:tw-tc4-mod1} \end{cmhtcbraster} \end{example} @@ -433,8 +433,8 @@ latexindent.pl -m tw-tc5.tex -l textwrap1A.yaml -o=+-mod1 \end{commandshell} gives the output in \cref{lst:tw-tc5-mod1}. \begin{cmhtcbraster}[raster column skip=.1\linewidth] - \cmhlistingsfromfile*[showspaces=true]{demonstrations/tw-tc5.tex}{\texttt{tw-tc5.tex}}{lst:tw-tc5} - \cmhlistingsfromfile*[showspaces=true]{demonstrations/tw-tc5-mod1.tex}{\texttt{tw-tc5-mod1.tex}}{lst:tw-tc5-mod1} + \cmhlistingsfromfile[showspaces=true]{demonstrations/tw-tc5.tex}{\texttt{tw-tc5.tex}}{lst:tw-tc5} + \cmhlistingsfromfile[showspaces=true]{demonstrations/tw-tc5-mod1.tex}{\texttt{tw-tc5-mod1.tex}}{lst:tw-tc5-mod1} \end{cmhtcbraster} The space at the end of the text block has been preserved. \end{example} @@ -448,8 +448,8 @@ latexindent.pl -m tw-tc6.tex -l textwrap1A.yaml -o=+-mod1 \end{commandshell} gives the output in \cref{lst:tw-tc6-mod1}. \begin{cmhtcbraster}[raster column skip=.1\linewidth] - \cmhlistingsfromfile*[showspaces=true]{demonstrations/tw-tc6.tex}{\texttt{tw-tc6.tex}}{lst:tw-tc6} - \cmhlistingsfromfile*[showspaces=true]{demonstrations/tw-tc6-mod1.tex}{\texttt{tw-tc6-mod1.tex}}{lst:tw-tc6-mod1} + \cmhlistingsfromfile[showspaces=true]{demonstrations/tw-tc6.tex}{\texttt{tw-tc6.tex}}{lst:tw-tc6} + \cmhlistingsfromfile[showspaces=true]{demonstrations/tw-tc6-mod1.tex}{\texttt{tw-tc6-mod1.tex}}{lst:tw-tc6-mod1} \end{cmhtcbraster} The space at the end of the text block has been preserved. \end{example} diff --git a/Master/texmf-dist/doc/support/latexindent/title.tex b/Master/texmf-dist/doc/support/latexindent/title.tex index bf6b1ec03d0..b9b3bdf117b 100644 --- a/Master/texmf-dist/doc/support/latexindent/title.tex +++ b/Master/texmf-dist/doc/support/latexindent/title.tex @@ -8,14 +8,14 @@ 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.17.3 + \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.18 \end{tcolorbox} } \author{Chris Hughes \thanks{and contributors! See \vref{sec:contributors}. For all communication, please visit \cite{latexindent-home}.}} -\date{2022-06-05} +\date{2022-06-12} \maketitle \begin{adjustwidth}{1cm}{1cm} \small diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm index 5decf68ddd6..5c9cd5c2ae1 100644 --- a/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm +++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm @@ -20,6 +20,6 @@ use warnings; use Exporter qw/import/; our @EXPORT_OK = qw/$versionNumber $versionDate/; -our $versionNumber = '3.17.3'; -our $versionDate = '2022-06-05'; +our $versionNumber = '3.18'; +our $versionDate = '2022-06-12'; 1 diff --git a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml index dd59a83531b..5f10f499bf9 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.17.3, 2022-06-05 +# defaultSettings.yaml for latexindent.pl, version 3.18, 2022-06-12 # 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 2915e567932..49dbe7192ee 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.17.3, 2022-06-05 +# latexindent.pl, version 3.18, 2022-06-12 # # 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