Merge branch 'develop'

cmhughes · Jul 14, 2024 · fed474e · fed474e
2 parents 18e2949 + 0dee1f4
commit fed474e
Show file tree

Hide file tree

Showing 27 changed files with 79 additions and 78 deletions.
diff --git a/.github/workflows/release-docker-ghcr.yml b/.github/workflows/release-docker-ghcr.yml
@@ -36,7 +36,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: get latexindent tag
         run: echo "TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV
-      - uses: docker/build-push-action@v5
+      - uses: docker/build-push-action@v6
         with:
           context: .
           push: true

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM perl:5.38.2-slim-threaded-buster
+FROM perl:5.40.0-slim-threaded-buster
 #
 # Docker necessary file
 #
@@ -17,7 +17,7 @@ FROM perl:5.38.2-slim-threaded-buster
 #
 
 ARG LATEXINDENT_VERSION
-ENV LATEXINDENT_VERSION ${LATEXINDENT_VERSION:-V3.24.2}
+ENV LATEXINDENT_VERSION ${LATEXINDENT_VERSION:-V3.24.3}
 
 RUN apt-get update \
     && apt-get install \

diff --git a/LatexIndent/GetYamlSettings.pm b/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/LatexIndent/Version.pm b/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.3';
+our $versionDate   = '2024-07-14';
 1
diff --git a/defaultSettings.yaml b/defaultSettings.yaml
@@ -1,5 +1,5 @@
 #
-# latexindent.pl, version 3.24.2, 2024-06-15
+# latexindent.pl, version 3.24.3, 2024-07-14
 #
 # defaultSettings.yaml, the default settings for latexindent.pl
 #

diff --git a/documentation/bashtips.txt b/documentation/bashtips.txt
diff --git a/documentation/changelog.md b/documentation/changelog.md
@@ -1,6 +1,9 @@
-<!-- announcement: encoding bug fix-->
+<!-- announcement: -y switch bug fix for lookForAlignDelims-->
 
 # changelog.md
+## V3.24.3, July 14, 2024
+`-y` switch bug fix for `lookForAlignDelims`, see [issue 551](https://github.com/cmhughes/latexindent.pl/issues/551)
+
 ## V3.24.2, June 15, 2024
 encoding bug fix, see [issue 547](https://github.com/cmhughes/latexindent.pl/issues/547), thanks to @fengzyf
 

diff --git a/documentation/conf.py b/documentation/conf.py
@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'3.24.2'
+version = u'3.24.3'
 # The full version, including alpha/beta/rc tags.
-release = u'3.24.2'
+release = u'3.24.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/documentation/demonstrations/pre-commit-config-conda.yaml b/documentation/demonstrations/pre-commit-config-conda.yaml
@@ -1,5 +1,5 @@
 - repo: https://github.com/cmhughes/latexindent.pl
-  rev: V3.24.2
+  rev: V3.24.3
   hooks:
   - id: latexindent-conda
     args: [-s]
diff --git a/documentation/demonstrations/pre-commit-config-cpan.yaml b/documentation/demonstrations/pre-commit-config-cpan.yaml
@@ -1,5 +1,5 @@
 - repo: https://github.com/cmhughes/latexindent.pl
-  rev: V3.24.2
+  rev: V3.24.3
   hooks:
   - id: latexindent
     args: [-s]
diff --git a/documentation/demonstrations/pre-commit-config-demo.yaml b/documentation/demonstrations/pre-commit-config-demo.yaml
@@ -1,5 +1,5 @@
 - repo: https://github.com/cmhughes/latexindent.pl
-  rev: V3.24.2
+  rev: V3.24.3
   hooks:
   - id: latexindent
     args: [-l, -m, -s, -w]
diff --git a/documentation/demonstrations/pre-commit-config-docker.yaml b/documentation/demonstrations/pre-commit-config-docker.yaml
@@ -1,5 +1,5 @@
 - repo: https://github.com/cmhughes/latexindent.pl
-  rev: V3.24.2
+  rev: V3.24.3
   hooks:
     - id: latexindent-docker
       args: [-s]
diff --git a/documentation/latexindent-yaml-schema.json b/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.3 2024-07-14",
   "type": "object",
   "properties": {
     "fileExtensionPreference": {

diff --git a/documentation/latexindent.tex b/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={%

diff --git a/documentation/oneSentencePerLine.yaml b/documentation/oneSentencePerLine.yaml
diff --git a/documentation/readme.txt b/documentation/readme.txt
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    latexindent.pl, version 3.24.2, 2024-06-15
+    latexindent.pl, version 3.24.3, 2024-07-14
 
     PERL script to indent code within environments, and align delimited 
     environments in .tex files.

diff --git a/documentation/sec-appendices.rst b/documentation/sec-appendices.rst
@@ -90,8 +90,8 @@ Linux users may be interested in exploring Perlbrew (“Perlbrew” n.d.); an ex
 
    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
@@ -1142,7 +1142,9 @@ which may receive the following result
 
      Active code page: 936
 
-and then the characters supported by the code page can be found in https://learn.microsoft.com/en-us/windows/win32/intl/code-page-identifiers. For example, the characters supported by the encoding corresponding to code page 936 are: ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312).
+and then the characters supported by the code page can be found in `https://learn.microsoft.com/en-us/windows/win32/intl/code-page-identifiers <Microsoft's
+  code page identifier
+  table>`__. For example, the characters supported by the encoding corresponding to code page 936 are: ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312).
 
 For Ubuntu Linux and macOS users, whether using the Perl script or the executable file, the options support UTF-8 characters.
 

diff --git a/documentation/sec-appendices.tex b/documentation/sec-appendices.tex
@@ -67,8 +67,8 @@
    \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/documentation/sec-introduction.tex b/documentation/sec-introduction.tex
@@ -53,7 +53,7 @@ \subsection{License}
  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

diff --git a/documentation/test-default-settings.tex b/documentation/test-default-settings.tex
@@ -1,8 +1,17 @@
 % arara: pdflatex: { files: [latexindent]}
 
-\subsection{test subsection}
 \begin{example}
   Testing example environment
+  Testing example environment
+  Testing example environment
+  Testing example environment
+  Testing example environment
+  Testing example environment
+  Testing example environment
+  Testing example environment
+  Testing example environment
+  Testing example environment
+  Testing example environment
 \end{example}
 
 % file used to check if line numbers are set correct for defaultSettings.yaml listings

diff --git a/documentation/title.tex b/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.24.2
+		\centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.24.3
 	\end{tcolorbox}
 }
 \author{Chris Hughes \thanks{and contributors!
 		See \vref{sec:contributors}.
 		For
 		all communication, please visit \cite{latexindent-home}.}}
-\date{2024-06-15}
+\date{2024-07-14}
 \maketitle
 \begin{adjustwidth}{1cm}{1cm}
 	\small

diff --git a/helper-scripts/update-version.sh b/helper-scripts/update-version.sh
@@ -48,10 +48,10 @@
 #        - <upload latexindent.zip to ctan>
 
 minorVersion=0
-oldVersion='3.24.1'
-newVersion='3.24.2'
-oldDate='2024-05-12'
-newDate='2024-06-15'
+oldVersion='3.24.2'
+newVersion='3.24.3'
+oldDate='2024-06-15'
+newDate='2024-07-14'
 updateVersion=0
 gitMode=0
 

diff --git a/latexindent.pl b/latexindent.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-#   latexindent.pl, version 3.24.2, 2024-06-15
+#   latexindent.pl, version 3.24.3, 2024-07-14
 #
 #	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

diff --git a/readme.md b/readme.md
@@ -21,7 +21,7 @@ and [pre-commit](https://latexindentpl.readthedocs.io/en/latest/sec-appendices.h
 
 ## version
 
-    latexindent.pl, version 3.24.2, 2024-06-15
+    latexindent.pl, version 3.24.3, 2024-07-14
 
 ## author
 Chris Hughes (cmhughes)
@@ -157,7 +157,7 @@ framework](https://pre-commit.com) by adding this to your
 
 ```yaml
   - repo: https://github.com/cmhughes/latexindent.pl.git
-    rev: V3.24.2
+    rev: V3.24.3
     hooks:
       - id: latexindent
 ```
@@ -234,7 +234,7 @@ I align with many of the approaches and details at [Dramatically increase your p
 
 ## perl version
 
-I develop latexindent.pl on Ubuntu Linux, using [perlbrew](https://perlbrew.pl/); I currently develop on perl version v5.39.1
+I develop latexindent.pl on Ubuntu Linux, using [perlbrew](https://perlbrew.pl/); I currently develop on perl version v5.40.0
 
 ## GitHub Actions
 The standalone executables `latexindent.exe`, `latexindent-linux`, `latexindent-macos` are created and released by [GitHub Actions](https://github.com/features/actions); the
@@ -280,6 +280,8 @@ I find that the following quotes resonate with me with regards to my approach to
 - *Perl’s primary strength is in text processing. Be it a regex-based approach or otherwise, Perl is excellent for logfile analysis, text manipulation, in-place editing of files, and scouring structured text files for specific field values*,
   Girish Venkatachalam [Why Perl is still relevant in 2022](https://stackoverflow.blog/2022/07/06/why-perl-is-still-relevant-in-2022/)
 - *Do the best you can until you know better. Then when you know better, do better.* Maya Angelou
+- *Gwneuwch y pethau bychain, do the little things*, Dewi Sant
+- *We are our mistakes. Sometimes they are the best part of us*. Harlen Coben, Think Twice
 
 ## changelog
 [changelog.md](documentation/changelog.md) provides details of the history of the project.
diff --git a/test-cases/alignment/alignment-test-cases.sh b/test-cases/alignment/alignment-test-cases.sh
@@ -343,6 +343,7 @@ latexindent.pl -s issue-543.tex -o=+-mod1
 
 latexindent.pl -s -m issue-541.tex -l issue-541.yaml -o=+-mod1
 
+latexindent.pl -y="lookForAlignDelims:tblr:alignFinalDoubleBackSlash:1" -s issue-551.tex -o=+-mod1
 [[ $silentMode == 0 ]] && set -x 
 [[ $gitStatus == 1 ]] && git status
 [[ $noisyMode == 1 ]] && makenoise
diff --git a/test-cases/alignment/issue-551-mod1.tex b/test-cases/alignment/issue-551-mod1.tex
@@ -0,0 +1,12 @@
+\documentclass{standalone}
+
+\usepackage{tabularray}
+
+\begin{document}
+
+\begin{tblr}{colspec={*{2}{c}},cell{1}{1}={r=2}{c}}
+	{1   \\2} & 3 \\
+	          & 4 \\
+\end{tblr}
+
+\end{document}
diff --git a/test-cases/alignment/issue-551.tex b/test-cases/alignment/issue-551.tex
@@ -0,0 +1,12 @@
+\documentclass{standalone}
+
+\usepackage{tabularray}
+
+\begin{document}
+
+\begin{tblr}{colspec={*{2}{c}},cell{1}{1}={r=2}{c}}
+    {1   \\2}&3\\
+     & 4 \\
+\end{tblr}
+
+\end{document}