diff options
Diffstat (limited to 'support/latexindent')
-rw-r--r-- | support/latexindent/LatexIndent/GetYamlSettings.pm | 3 | ||||
-rw-r--r-- | support/latexindent/LatexIndent/Version.pm | 4 | ||||
-rw-r--r-- | support/latexindent/LatexIndent/Wrap.pm | 7 | ||||
-rw-r--r-- | support/latexindent/README | 2 | ||||
-rw-r--r-- | support/latexindent/bin/linux/latexindent | bin | 7875395 -> 7875489 bytes | |||
-rw-r--r-- | support/latexindent/bin/macos/latexindent | bin | 7569205 -> 7569299 bytes | |||
-rw-r--r-- | support/latexindent/defaultSettings.yaml | 2 | ||||
-rw-r--r-- | support/latexindent/documentation/latexindent-yaml-schema.json | 2 | ||||
-rw-r--r-- | support/latexindent/documentation/latexindent.pdf | bin | 1297627 -> 1274961 bytes | |||
-rw-r--r-- | support/latexindent/documentation/latexindent.tex | 11 | ||||
-rwxr-xr-x | support/latexindent/latexindent.pl | 2 |
11 files changed, 22 insertions, 11 deletions
diff --git a/support/latexindent/LatexIndent/GetYamlSettings.pm b/support/latexindent/LatexIndent/GetYamlSettings.pm index 6365e0fd93..cbea5437c6 100644 --- a/support/latexindent/LatexIndent/GetYamlSettings.pm +++ b/support/latexindent/LatexIndent/GetYamlSettings.pm @@ -749,6 +749,9 @@ sub yaml_read_settings { my $parent = $keysValues[0]; my $child = $keysValues[1]; my $grandchild = $keysValues[2]; + + delete $mainSettings{$parent}{$child} if (defined $mainSettings{$parent}{$child} and ref $mainSettings{$parent}{$child} ne "HASH" ); + $logger->info("Updating mainSettings with $parent: $child: $grandchild: $value"); $mainSettings{$parent}{$child}{$grandchild} = $value; } diff --git a/support/latexindent/LatexIndent/Version.pm b/support/latexindent/LatexIndent/Version.pm index 5232967fb9..039d492356 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.24.2'; -our $versionDate = '2024-06-15'; +our $versionNumber = '3.24.4'; +our $versionDate = '2024-07-18'; 1 diff --git a/support/latexindent/LatexIndent/Wrap.pm b/support/latexindent/LatexIndent/Wrap.pm index 334902dc66..1116b05fa8 100644 --- a/support/latexindent/LatexIndent/Wrap.pm +++ b/support/latexindent/LatexIndent/Wrap.pm @@ -659,6 +659,13 @@ sub text_wrap_comment_blocks { # call the text wrapping routine my $columns = ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{columns}; + # fail gracefully if columns == 0 + if ($columns==0){ + $logger->warn("* textWrapOptions: columns is set to 0, can't text wrap with this"); + ${ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{comments} }{wrap} = 0; + return; + } + # # text wrap comment blocks # diff --git a/support/latexindent/README b/support/latexindent/README index 0b58c4ee72..3bd2dbfe98 100644 --- a/support/latexindent/README +++ b/support/latexindent/README @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - latexindent.pl, version 3.24.2, 2024-06-15 + latexindent.pl, version 3.24.4, 2024-07-18 PERL script to indent code within environments, and align delimited environments in .tex files. diff --git a/support/latexindent/bin/linux/latexindent b/support/latexindent/bin/linux/latexindent Binary files differindex 00a6b1c1ae..f6337243cb 100644 --- a/support/latexindent/bin/linux/latexindent +++ b/support/latexindent/bin/linux/latexindent diff --git a/support/latexindent/bin/macos/latexindent b/support/latexindent/bin/macos/latexindent Binary files differindex 649392d07e..63421aa529 100644 --- a/support/latexindent/bin/macos/latexindent +++ b/support/latexindent/bin/macos/latexindent diff --git a/support/latexindent/defaultSettings.yaml b/support/latexindent/defaultSettings.yaml index 15073c2f98..7ad03f254b 100644 --- a/support/latexindent/defaultSettings.yaml +++ b/support/latexindent/defaultSettings.yaml @@ -1,5 +1,5 @@ # -# latexindent.pl, version 3.24.2, 2024-06-15 +# latexindent.pl, version 3.24.4, 2024-07-18 # # defaultSettings.yaml, the default settings for latexindent.pl # diff --git a/support/latexindent/documentation/latexindent-yaml-schema.json b/support/latexindent/documentation/latexindent-yaml-schema.json index 8f457e916f..8f0cf208e2 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.24.2 2024-06-15", + "description": "latexindent.pl YAML schema helper, V3.24.4 2024-07-18", "type": "object", "properties": { "fileExtensionPreference": { diff --git a/support/latexindent/documentation/latexindent.pdf b/support/latexindent/documentation/latexindent.pdf Binary files differindex 60f57e8d37..19361f5268 100644 --- a/support/latexindent/documentation/latexindent.pdf +++ b/support/latexindent/documentation/latexindent.pdf diff --git a/support/latexindent/documentation/latexindent.tex b/support/latexindent/documentation/latexindent.tex index e5a2ae3b16..fefde34ec2 100644 --- a/support/latexindent/documentation/latexindent.tex +++ b/support/latexindent/documentation/latexindent.tex @@ -131,6 +131,7 @@ % bibliographies \addbibresource{latex-indent} \addbibresource{contributors} +\BiblatexSplitbibDefernumbersWarningOff % http://tex.stackexchange.com/questions/122135/how-to-add-a-png-icon-on-the-right-side-of-a-tcolorbox-title \newtcolorbox{warning}{parbox=false, @@ -585,14 +586,14 @@ title={example~\thetcbcounter}, fonttitle=\bfseries\sffamily, detach title, - before upper={\llap{\tcbtitle\hspace{5mm}}}, coltitle=black, colback=white, grow to left by=6mm, % % circles and line by the side % - overlay unbroken={% + overlay unbroken and first={% + \node at ([xshift=-8mm,yshift=-4.5mm]interior.north west) {\bfseries example \thetcbcounter}; \path [fill=black] ([xshift=1mm,yshift=3mm]interior.south east) node{\hbox{\rule{1ex}{1ex}}}; }, overlay last={% @@ -859,7 +860,7 @@ throughout this document for details}. \subsection{Quick start}\label{sec:quickstart} - When \texttt{latexindent.pl} reads and writes files, the files are read and written in UTF-8 format by default. + When \texttt{latexindent.pl} reads and writes files, the files are read and written in UTF-8 format by default. That is to say, the encoding format for tex and yaml files needs to be in UTF-8 format. If you'd like to get started with \texttt{latexindent.pl} then simply type @@ -8563,8 +8564,8 @@ perl latexindent-module-installer.pl \begin{commandshell} sudo apt-get install perlbrew perlbrew init -perlbrew install perl-5.39.1 -perlbrew switch perl-5.39.1 +perlbrew install perl-5.40.0 +perlbrew switch perl-5.40.0 sudo apt-get install curl curl -L http://cpanmin.us | perl - App::cpanminus cpanm YAML::Tiny diff --git a/support/latexindent/latexindent.pl b/support/latexindent/latexindent.pl index c85bdf2047..a467fb420e 100755 --- a/support/latexindent/latexindent.pl +++ b/support/latexindent/latexindent.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# latexindent.pl, version 3.24.2, 2024-06-15 +# latexindent.pl, version 3.24.4, 2024-07-18 # # 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 |