diff options
Diffstat (limited to 'support')
18 files changed, 244 insertions, 40 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index e91efca812..b104481a42 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,3 +1,18 @@ +2022-06-01 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-fonts-modern.tex ( + ./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/mlm/ec-mlm.htf, + ./tex4ht.dir/texmf/tex4ht/ht-fonts/alias/mlm/ec-mlmvt.htf + ): added EC versions of Mlmodern fonts. + https://tex.stackexchange.com/a/643260/2891 + +2022-05-24 Karl Berry <karl@freefriends.org> + + * tex4ht-cond4ht.tex (\mkfilename == mktex4ht.4ht): + instead of doing an \ifx inside \usepackage[...], set and use + \toks0. Seems to avoid some instances of + "(\end occurred when \ifx on line NN was incomplete)". + 2022-05-23 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (xr-hyper.4ht): added closing \fi to prevent diff --git a/support/TeX4ht/source/Makefile b/support/TeX4ht/source/Makefile index 97e49ce447..01514e9fe7 100644 --- a/support/TeX4ht/source/Makefile +++ b/support/TeX4ht/source/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 1091 2022-03-17 11:02:16Z michal_h21 $ +# $Id: Makefile 1141 2022-06-01 21:43:42Z karl $ # This file is public domain. Originally written 2010, Karl Berry. # Assumes GNU make. @@ -718,7 +718,7 @@ endif # The directories where tex4ht is installed in TeX Live, # i.e., where we will copy and commit updates. -texmf = /r/tug/home/texlive/karl/Master/texmf-dist +texmf = /v/texlive/karl/Master/texmf-dist inst_dir_4ht = $(texmf)/tex/generic/tex4ht inst_dir_top = $(texmf)/tex4ht inst_dir_scripts = $(texmf)/scripts/tex4ht @@ -784,7 +784,7 @@ diff-htfonts: # Compare and update. update-htfonts: - ./update-htfonts update $(ht_fonts_devdir) $(ht_fonts_instdir) | tee /tmp/htdif + ./update-htfonts update $(ht_fonts_devdir) $(ht_fonts_instdir) | tee /tmp/htupd .PHONY: update-htfonts # diff --git a/support/TeX4ht/source/tex4ht-cond4ht.tex b/support/TeX4ht/source/tex4ht-cond4ht.tex index c0a0342139..f768f2e77d 100644 --- a/support/TeX4ht/source/tex4ht-cond4ht.tex +++ b/support/TeX4ht/source/tex4ht-cond4ht.tex @@ -1,12 +1,13 @@ -% $Id: tex4ht-cond4ht.tex 906 2021-04-18 15:43:04Z karl $ +% $Id: tex4ht-cond4ht.tex 1139 2022-05-25 01:16:19Z karl $ % (1) tex tex4ht-cond4ht or xhtex tex4ht-cond4ht % (2) tex cond4ht.4ht % -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. +\vbadness=10000 \csname tex4ht\endcsname \input ProTex.sty @@ -454,7 +455,7 @@ tex4ht-4ht, e.g., for adding cases to {\tt\string\exit:ifnot}. % the copyright notice. % % |mkfilename (|version), generated from |jobname.4ht -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari |<TeX4ht copywrite|> @@ -567,12 +568,14 @@ tex4ht-4ht, e.g., for adding cases to {\tt\string\exit:ifnot}. } \catcode`\:=12 - - \documentclass{book} \ifx \HCode\UnDef - \def\temp{\usepackage[\ifx \OPTIONS\UnDef - xhtml,3,sections+\else \OPTIONS\fi]{tex4ht}} + \ifx\OPTIONS\UnDef + \toks0={xhtml,3,sections+}% + \else + \toks0={\OPTIONS}% + \fi + \def\temp{\usepackage[\the\toks0]{tex4ht}} \expandafter\temp \fi \Configure{ProTex}{4ht,<<<>>|empty>,||,title,list,[[]]} diff --git a/support/TeX4ht/source/tex4ht-fonts-modern.tex b/support/TeX4ht/source/tex4ht-fonts-modern.tex index bbffa7db8f..0b01264933 100644 --- a/support/TeX4ht/source/tex4ht-fonts-modern.tex +++ b/support/TeX4ht/source/tex4ht-fonts-modern.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-fonts-modern.tex 1132 2022-05-09 08:32:38Z michal_h21 $ +% $Id: tex4ht-fonts-modern.tex 1140 2022-06-01 13:54:37Z michal_h21 $ % Included from tex4ht-fonts-noncjk.tex, not run on its own. % % Copyright 2009-2020 TeX Users Group @@ -2151,6 +2151,38 @@ htfcss: rm-mlmvtto font-style: oblique; font-family: monospace,monospace; >>> \AddFont{rm-mlmvt}{alias/mlm/rm-mlmvt} +\<ec-mlm\><<< +.lm-ec +htfcss: ec-mlmbo font-style: oblique; +htfcss: ec-mlmbx font-weight: bold; +htfcss: ec-mlmbxi font-style:italic; font-weight: bold; +htfcss: ec-mlmbxo font-style: oblique; font-weight: bold; +htfcss: ec-mlmri font-style:italic; +htfcss: ec-mlmro font-style: oblique; +htfcss: ec-mlmss font-family: sans-serif; +htfcss: ec-mlmssbo font-family: sans-serif; font-style: oblique; font-weight: bold; +htfcss: ec-mlmssbx font-family: sans-serif; font-weight: bold; +htfcss: ec-mlmssdc font-family: sans-serif; +htfcss: ec-mlmssdo font-family: sans-serif; font-style: oblique; +htfcss: ec-mlmsso font-family: sans-serif; font-style: oblique; +htfcss: ec-mlmssq font-family: sans-serif; +htfcss: ec-mlmssqbo font-family: sans-serif; font-style: oblique; font-weight: bold; +htfcss: ec-mlmssqbx font-family: sans-serif; font-weight: bold; +htfcss: ec-mlmssqo font-family: sans-serif; font-style: oblique; +htfcss: ec-mlmcsc font-variant: small-caps; +>>> +\AddFont{ec-mlm}{alias/mlm/ec-mlm} + +\<ec-mlmvt\><<< +.lm-ec +htfcss: ec-mlmvtk font-family: monospace,monospace; +htfcss: ec-mlmvtko font-style: oblique; font-family: monospace,monospace; +htfcss: ec-mlmvtl font-weight: light; font-family: monospace,monospace; +htfcss: ec-mlmvtlo font-weight: light; font-style: oblique; font-family: monospace,monospace; +htfcss: ec-mlmvtt font-family: monospace,monospace; +htfcss: ec-mlmvtto font-style: oblique; font-family: monospace,monospace; +>>> +\AddFont{ec-mlmvt}{alias/mlm/ec-mlmvt} \<mlmbsy\><<< .plbsy diff --git a/support/latexindent/LatexIndent/GetYamlSettings.pm b/support/latexindent/LatexIndent/GetYamlSettings.pm index 24e1291e75..96577d28d0 100644 --- a/support/latexindent/LatexIndent/GetYamlSettings.pm +++ b/support/latexindent/LatexIndent/GetYamlSettings.pm @@ -435,6 +435,13 @@ sub yaml_read_settings { $logger->info( "Not showing settings in the log file (see showEveryYamlRead and showAmalgamatedSettings)."); } + + # warning to log file if modifyLineBreaks specified and m switch not active + if ( ${ $userSettings->[0] }{modifyLineBreaks} and !$is_m_switch_active ) { + $logger->warn("*modifyLineBreaks specified and m switch is *not* active"); + $logger->warn("perhaps you intended to call"); + $logger->warn(" latexindent.pl -m -l $settings ${$self}{fileName}"); + } } else { # otherwise print a warning that we can not read userSettings.yaml diff --git a/support/latexindent/LatexIndent/Version.pm b/support/latexindent/LatexIndent/Version.pm index edbb6252aa..5decf68ddd 100644 --- a/support/latexindent/LatexIndent/Version.pm +++ b/support/latexindent/LatexIndent/Version.pm @@ -20,6 +20,6 @@ use warnings; use Exporter qw/import/; our @EXPORT_OK = qw/$versionNumber $versionDate/; -our $versionNumber = '3.17.2'; -our $versionDate = '2022-04-14'; +our $versionNumber = '3.17.3'; +our $versionDate = '2022-06-05'; 1 diff --git a/support/latexindent/LatexIndent/Wrap.pm b/support/latexindent/LatexIndent/Wrap.pm index 1850a83c90..7f3d026a4e 100644 --- a/support/latexindent/LatexIndent/Wrap.pm +++ b/support/latexindent/LatexIndent/Wrap.pm @@ -249,12 +249,36 @@ sub text_wrap { # initiate the trailing comments storage my $trailingComments = q(); - # grab all *internal* trailing comments from the block - while ( $textWrapBlockStorageValue =~ m|$trailingCommentRegExp| ) { - $textWrapBlockStorageValue =~ s|(\h*$trailingCommentRegExp)||s; - $trailingComments .= $1; + # about trailing comments + # + # - trailing comments that do *not* have leading space instruct the text + # wrap routine to connect the lines *without* space + # + # - multiple trailing comments will be connected at the end of the text wrap block + # + # - the number of spaces between the end of the text wrap block and + # the (possibly combined) trailing comments is determined by the + # spaces (if any) at the end of the text wrap block + + # for trailing comments that + # + # do *NOT* have a leading space + # do have a trailing line break + # + # then we *remove* the trailing line break + while ( $textWrapBlockStorageValue =~ m|\H$trailingCommentRegExp\h*\R|s ) { + $textWrapBlockStorageValue =~ s|(\H)($trailingCommentRegExp)\h*\R|$1$2|s; + } + + # now we put all of the trailing comments together + while ( $textWrapBlockStorageValue =~ m|$trailingCommentRegExp|s ) { + $textWrapBlockStorageValue =~ s|($trailingCommentRegExp)||s; + $trailingComments = $trailingComments . $1; } + $trailingComments =~ s/\h{2,}/ /sg + if ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{multipleSpacesToSingle}; + # determine if text wrapping will remove paragraph line breaks my $removeBlockLineBreaks = ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{removeBlockLineBreaks}; diff --git a/support/latexindent/README b/support/latexindent/README index 6ea4b951d1..9a6c7d2718 100644 --- a/support/latexindent/README +++ b/support/latexindent/README @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - latexindent.pl, version 3.17.2, 2022-04-14 + latexindent.pl, version 3.17.3, 2022-06-05 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 c64dd5aeae..dd59a83531 100644 --- a/support/latexindent/defaultSettings.yaml +++ b/support/latexindent/defaultSettings.yaml @@ -1,4 +1,4 @@ -# defaultSettings.yaml for latexindent.pl, version 3.17.2, 2022-04-14 +# defaultSettings.yaml for latexindent.pl, version 3.17.3, 2022-06-05 # a script that aims to # beautify .tex, .sty, .cls files # diff --git a/support/latexindent/documentation/latexindent-yaml-schema.json b/support/latexindent/documentation/latexindent-yaml-schema.json index 8b5378679c..47b70ecf99 100644 --- a/support/latexindent/documentation/latexindent-yaml-schema.json +++ b/support/latexindent/documentation/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.2 2022-04-14", + "description": "latexindent.pl YAML schema helper, V3.17.3 2022-06-05", "type": "object", "properties": { "fileExtensionPreference": { diff --git a/support/latexindent/documentation/latexindent.pdf b/support/latexindent/documentation/latexindent.pdf Binary files differindex 86b5f93d0b..323e4716d2 100644 --- a/support/latexindent/documentation/latexindent.pdf +++ b/support/latexindent/documentation/latexindent.pdf diff --git a/support/latexindent/documentation/sec-appendices.tex b/support/latexindent/documentation/sec-appendices.tex index ca4608a259..03a2961cc6 100644 --- a/support/latexindent/documentation/sec-appendices.tex +++ b/support/latexindent/documentation/sec-appendices.tex @@ -2,10 +2,16 @@ \appendix \section{Required Perl modules}\label{sec:requiredmodules} If you intend to use \texttt{latexindent.pl} and \emph{not} one of the supplied - standalone executable files, then you will need a few standard Perl modules -- if you can - run the minimum code in \cref{lst:helloworld} (\texttt{perl helloworld.pl}) then you will - be able to run \texttt{latexindent.pl}, otherwise you may need to install the missing - modules -- see \cref{sec:module-installer,sec:manual-module-instal}. + standalone executable files (\texttt{latexindent.exe} is available for Windows users + without Perl, see \cref{subsubsec:latexindent:exe}), then you will need a few standard + Perl modules. + + If you can run the minimum code in \cref{lst:helloworld} as in + \begin{commandshell} +perl helloworld.pl + \end{commandshell} + then you will be able to run \texttt{latexindent.pl}, otherwise you may need to install + the missing modules; see \cref{sec:module-installer,sec:manual-module-instal}. \begin{cmhlistings}[style=tcblatex,language=Perl]{\texttt{helloworld.pl}}{lst:helloworld} #!/usr/bin/perl @@ -137,6 +143,10 @@ brew install cpanm cpanm YAML::Tiny cpanm File::HomeDir \end{commandshell} + Alternatively, + \begin{commandshell} +brew install latexindent +\end{commandshell} \subsubsection{Windows} Strawberry Perl users on Windows might use \texttt{CPAN client}. All of the modules are @@ -595,8 +605,8 @@ latexindent.pl -y="dos2unixlinebreaks:1" myfile.tex \section{Differences from Version 2.2 to 3.0}\label{app:differences} There are a few (small) changes to the interface when comparing Version 2.2 to Version - 3.0. Explicitly, in previous versions you might have run, for example, - \index{switches!-o demonstration} + 3.0. Explicitly, in previous versions you might have run, for example, \index{switches!-o + demonstration} \begin{commandshell} latexindent.pl -o myfile.tex outputfile.tex \end{commandshell} diff --git a/support/latexindent/documentation/sec-conclusions-know-limitations.tex b/support/latexindent/documentation/sec-conclusions-know-limitations.tex index 82fe626428..7a45e46382 100644 --- a/support/latexindent/documentation/sec-conclusions-know-limitations.tex +++ b/support/latexindent/documentation/sec-conclusions-know-limitations.tex @@ -1,7 +1,7 @@ % arara: pdflatex: { files: [latexindent]} \section{Conclusions and known limitations}\label{sec:knownlimitations} There are a number of known limitations of the script, and almost certainly quite a few - that are \emph{unknown}! The known issues include: + that are \emph{unknown}! The known issues include: \begin{description} \item[multicolumn alignment] when working with code blocks in which multicolumn commands overlap, the algorithm can fail; see \vref{lst:tabular2-mod2}. diff --git a/support/latexindent/documentation/sec-fine-tuning.tex b/support/latexindent/documentation/sec-fine-tuning.tex index ed0039a805..8798b276ab 100644 --- a/support/latexindent/documentation/sec-fine-tuning.tex +++ b/support/latexindent/documentation/sec-fine-tuning.tex @@ -24,7 +24,7 @@ \end{warning} \begin{widepage} - \cmhlistingsfromfile[style=fineTuning]{../defaultSettings.yaml}[width=.95\linewidth,before=\centering,yaml-TCB]{\texttt{fineTuning}}{lst:fineTuning} + \cmhlistingsfromfile[style=fineTuning]{../defaultSettings.yaml}[width=.95\linewidth,before=\centering,enhanced jigsaw,breakable,yaml-TCB]{\texttt{fineTuning}}{lst:fineTuning} \end{widepage} The fields given in \cref{lst:fineTuning} are all \emph{regular expressions}. This manual diff --git a/support/latexindent/documentation/sec-how-to-use.tex b/support/latexindent/documentation/sec-how-to-use.tex index 9faa411265..c8db5d20d1 100644 --- a/support/latexindent/documentation/sec-how-to-use.tex +++ b/support/latexindent/documentation/sec-how-to-use.tex @@ -16,17 +16,25 @@ respectively. We will discuss how to change the settings and behaviour of the script in \vref{sec:defuseloc}. +\subsection{Requirements} +\subsubsection{Perl users} + Perl users will need a few standard Perl modules -- see \vref{sec:requiredmodules} for + details; \announce{2018-01-13}{perl module installer helper script} in particular, note + that a module installer helper script is shipped with \texttt{latexindent.pl}.% + +\subsubsection{Windows users without perl}\label{subsubsec:latexindent:exe} \texttt{latexindent.pl} ships with \texttt{latexindent.exe} for Windows - users, so that you can use the script with or without a Perl distribution. If you plan to - use \texttt{latexindent.pl} (i.e, the original Perl script) then you will need a few - standard Perl modules -- see \vref{sec:requiredmodules} for - details;% - \announce{2018-01-13}{perl module installer helper script} in particular, note that a module installer helper script is shipped with - \texttt{latexindent.pl}. + users, so that you can use the script with or without a Perl distribution. + + Users of \texttt{latexindent.exe} need only two files: \texttt{latexindent.exe} and + \texttt{defaultSettings.yaml}, both of which are available from \cite{latexindent-home}. MiKTeX users on Windows may like to see \cite{miktex-guide} for details of how to use \texttt{latexindent.exe} without a Perl installation. \index{MiKTeX} - \index{latexindent.exe} + \index{latexindent.exe} \index{Windows} + +\subsubsection{conda users} + Users of \texttt{conda} should see the details given in \cref{sec:app:conda}. \subsection{From the command line}\label{sec:commandline} \texttt{latexindent.pl} has a number of different switches/flags/options, which diff --git a/support/latexindent/documentation/subsec-text-wrap.tex b/support/latexindent/documentation/subsec-text-wrap.tex index e03eb66395..fddbffd98b 100644 --- a/support/latexindent/documentation/subsec-text-wrap.tex +++ b/support/latexindent/documentation/subsec-text-wrap.tex @@ -30,7 +30,17 @@ \item setting \texttt{columns} to $-1$ will \emph{only} remove line breaks within the text wrap block; \item by default, the text wrapping routine will remove line breaks within text blocks because - \texttt{removeBlockLineBreaks} is set to 1; switch it to 0 if you wish to change this. + \texttt{removeBlockLineBreaks} is set to 1; switch it to 0 if you wish to change this; + \item about trailing comments within text wrap blocks: + \begin{enumerate} + \item trailing comments that do \emph{not} have leading space instruct the text wrap routine to + connect the lines \emph{without} space (see \cref{lst:tw-tc2}); + \item multiple trailing comments will be connected at the end of the text wrap block (see + \cref{lst:tw-tc4}); + \item the number of spaces between the end of the text wrap block and the (possibly combined) + trailing comments is determined by the spaces (if any) at the end of the text wrap block + (see \cref{lst:tw-tc5}). + \end{enumerate} \end{enumerate} We demonstrate this feature using a series of examples. @@ -349,6 +359,101 @@ latexindent.pl -m -l textwrap1A.yaml,tw-be-equation.yaml tw-be-equation.tex Naturally, you should feel encouraged to customise this as you see fit. \end{example} +\subsubsection{Text wrap: trailing comments and spaces} + We explore the behaviour of the text wrap routine in relation to trailing comments using + the following examples. + + \begin{example} + The file in \cref{lst:tw-tc1} contains a trailing comment which \emph{does} have a space + infront of it. + + Running the command + \begin{commandshell} +latexindent.pl -m tw-tc1.tex -l textwrap1A.yaml -o=+-mod1 +\end{commandshell} + 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} + \end{cmhtcbraster} + \end{example} + + \begin{example} + The file in \cref{lst:tw-tc2} contains a trailing comment which does \emph{not} have a + space infront of it. + + Running the command + \begin{commandshell} +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} + \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. + \end{example} + + \begin{example} + The file in \cref{lst:tw-tc3} contains multiple trailing comments. + + Running the command + \begin{commandshell} +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} + \end{cmhtcbraster} + \end{example} + + \begin{example} + The file in \cref{lst:tw-tc4} contains multiple trailing comments. + + Running the command + \begin{commandshell} +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} + \end{cmhtcbraster} + \end{example} + + \begin{example} + The file in \cref{lst:tw-tc5} contains multiple trailing comments. + + Running the command + \begin{commandshell} +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} + \end{cmhtcbraster} + The space at the end of the text block has been preserved. + \end{example} + + \begin{example} + The file in \cref{lst:tw-tc6} contains multiple trailing comments. + + Running the command + \begin{commandshell} +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} + \end{cmhtcbraster} + The space at the end of the text block has been preserved. + \end{example} + \subsubsection{Text wrap: huge, tabstop and separator} The \announce{2021-07-23}*{huge:overflow is now default} default value of \texttt{huge} is \texttt{overflow}, which means that words will \emph{not} be broken by the text diff --git a/support/latexindent/documentation/title.tex b/support/latexindent/documentation/title.tex index ef2c39d1c2..bf6b1ec03d 100644 --- a/support/latexindent/documentation/title.tex +++ b/support/latexindent/documentation/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.2 + \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.17.3 \end{tcolorbox} } \author{Chris Hughes \thanks{and contributors! See \vref{sec:contributors}. For all communication, please visit \cite{latexindent-home}.}} -\date{2022-04-14} +\date{2022-06-05} \maketitle \begin{adjustwidth}{1cm}{1cm} \small @@ -26,5 +26,5 @@ regex-based substitutions. All user options are customisable via the switches and the YAML interface. - A quick start guide is given in \vref{sec:quickstart}. + tl;dr, a quick start guide is given in \vref{sec:quickstart}. \end{adjustwidth} diff --git a/support/latexindent/latexindent.pl b/support/latexindent/latexindent.pl index f75b8165a5..2915e56793 100755 --- a/support/latexindent/latexindent.pl +++ b/support/latexindent/latexindent.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# latexindent.pl, version 3.17.2, 2022-04-14 +# latexindent.pl, version 3.17.3, 2022-06-05 # # 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 |