From f0562906b4d057593d4a13b9bc958529b280e4e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 31 Mar 2024 10:59:58 +0100 Subject: [PATCH 1/4] Bump tj-actions/changed-files from 43 to 44 (#533) Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 43 to 44. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v43...v44) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/batch-check.yaml | 2 +- .github/workflows/test-cases-on-pull.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/batch-check.yaml b/.github/workflows/batch-check.yaml index 84def54a..95c869f5 100644 --- a/.github/workflows/batch-check.yaml +++ b/.github/workflows/batch-check.yaml @@ -50,7 +50,7 @@ jobs: with: fetch-depth: 2 - name: Check for changed pm files, latexindent.pl, defaultSettings.yaml - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@v44 id: changed-files with: files: | diff --git a/.github/workflows/test-cases-on-pull.yaml b/.github/workflows/test-cases-on-pull.yaml index 6ad0f7d8..62b92e80 100644 --- a/.github/workflows/test-cases-on-pull.yaml +++ b/.github/workflows/test-cases-on-pull.yaml @@ -38,7 +38,7 @@ jobs: fetch-depth: 0 - name: Get changed files, latexindent.pl id: changed-files - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@v44 with: files: | latexindent.pl @@ -92,7 +92,7 @@ jobs: sed -i.bak "s/checkgitdiff//" test-cases.sh ./test-cases.sh -s - name: Check for changed files in test-cases - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@v44 id: changed-files with: files: | From b5fb701239da3c13d1139278d5eb6300ca172e0e Mon Sep 17 00:00:00 2001 From: cmhughes Date: Mon, 1 Apr 2024 16:21:09 +0100 Subject: [PATCH 2/4] GitHub Actions, batch-check.yaml updated to include file change update --- .github/workflows/batch-check.yaml | 4 ++++ readme.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/batch-check.yaml b/.github/workflows/batch-check.yaml index 95c869f5..4f867268 100644 --- a/.github/workflows/batch-check.yaml +++ b/.github/workflows/batch-check.yaml @@ -195,6 +195,8 @@ jobs: cat test-cases/GCString-test/indent.log linux-executable-GCString-test: + needs: check-pm-files-changed + if: ${{fromJSON(needs.check-pm-files-changed.outputs.anychanged)}} name: 'create Linux executable latexindent' runs-on: 'ubuntu-latest' steps: @@ -249,6 +251,8 @@ jobs: cat test-cases/GCString-test/indent2.log macos-executable-GCString-test: + needs: check-pm-files-changed + if: ${{fromJSON(needs.check-pm-files-changed.outputs.anychanged)}} name: 'create MacOS executable latexindent' runs-on: 'macos-latest' steps: diff --git a/readme.md b/readme.md index 52ab3250..9b5b38b1 100644 --- a/readme.md +++ b/readme.md @@ -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.38.0 +I develop latexindent.pl on Ubuntu Linux, using [perlbrew](https://perlbrew.pl/); I currently develop on perl version v5.38.2 ## GitHub Actions The standalone executables `latexindent.exe`, `latexindent-linux`, `latexindent-macos` are created and released by [GitHub Actions](https://github.com/features/actions); the From 55306bcd77f713abef53c1240b3fd867296203dd Mon Sep 17 00:00:00 2001 From: cmhughes Date: Sat, 6 Apr 2024 17:02:54 +0100 Subject: [PATCH 3/4] GitHub actions updated to use perl-version: 'latest' --- .github/workflows/batch-check.yaml | 19 +++++++++---------- .../build-documentation-and-executables.yaml | 13 ++++++------- .github/workflows/test-cases-on-pull.yaml | 2 +- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/batch-check.yaml b/.github/workflows/batch-check.yaml index 4f867268..d79b375f 100644 --- a/.github/workflows/batch-check.yaml +++ b/.github/workflows/batch-check.yaml @@ -49,7 +49,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 2 - - name: Check for changed pm files, latexindent.pl, defaultSettings.yaml + - name: Check for changed pm files, latexindent.pl, defaultSettings.yaml, batch-check.yaml uses: tj-actions/changed-files@v44 id: changed-files with: @@ -57,6 +57,7 @@ jobs: latexindent.pl defaultSettings.yaml LatexIndent/*.pm + .github/workflows/batch-check.yaml - if: ${{ steps.changed-files.outputs.any_changed == 'true' }} name: List all relevant changed files run: | @@ -67,7 +68,7 @@ jobs: name: No perl based files have changed run: | echo "" - echo "none of latexindent.pl, defaultSettings.yaml, LatexIndent/*.pm have changed since last commit" + echo "none of latexindent.pl, defaultSettings.yaml, LatexIndent/*.pm, batch-check.yaml have changed since last commit" echo "no need to run the rest of batch-check.yaml :)" echo "" latexindent-batch-check: @@ -80,7 +81,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, macos-latest, windows-latest] - perl: [ '5.32', '5.30', '5.28' ] + perl: [ '5.38', '5.36', '5.34' ] runs-on: ${{ matrix.platform }} steps: # checkout github.com/cmhughes/latexindent.pl @@ -101,7 +102,6 @@ jobs: uses: shogo82148/actions-setup-perl@v1 with: perl-version: ${{ matrix.perl }} - distribution: strawberry - if: ${{ matrix.platform == 'windows-latest' }} name: installing perl modules for latexindent.pl on windows-latest run: | @@ -126,7 +126,7 @@ jobs: cjk-windows-exe-test: needs: check-pm-files-changed if: ${{fromJSON(needs.check-pm-files-changed.outputs.anychanged)}} - name: 'create Windows executable latexindent.exe using Strawberry Perl 5.32 on Windows' + name: 'create Windows executable latexindent.exe using Perl (latest) on Windows' runs-on: 'windows-latest' steps: # @@ -138,11 +138,10 @@ jobs: # # https://github.com/marketplace/actions/setup-perl-environment # - - name: install Strawberry Perl + - name: install Perl uses: shogo82148/actions-setup-perl@v1 with: - perl-version: '5.32' - distribution: strawberry + perl-version: 'latest' - name: install Perl modules using cpan run: | wmic os get osarchitecture @@ -212,7 +211,7 @@ jobs: - name: install Perl uses: shogo82148/actions-setup-perl@v1 with: - perl-version: '5.32' + perl-version: 'latest' - name: install Perl modules using cpan run: | cpanm -f PAR::Packer @@ -268,7 +267,7 @@ jobs: - name: install Perl uses: shogo82148/actions-setup-perl@v1 with: - perl-version: '5.32' + perl-version: 'latest' - name: install Perl modules using cpan run: | cpanm -f PAR::Packer diff --git a/.github/workflows/build-documentation-and-executables.yaml b/.github/workflows/build-documentation-and-executables.yaml index 69831267..ddfe5724 100644 --- a/.github/workflows/build-documentation-and-executables.yaml +++ b/.github/workflows/build-documentation-and-executables.yaml @@ -2,7 +2,7 @@ name: build latexindent executables and documentation and upload to release page # PURPOSE: # # 1. build latexindent.pdf -# 2. build latexindent.exe using PAR::Packer on Strawberry Perl +# 2. build latexindent.exe using PAR::Packer on Windows Perl # 3. build latexindent-linux using PAR::Packer on Ubuntu # 4. build latexindent-macos using PAR::Packer on macOS # 5. create release @@ -62,7 +62,7 @@ jobs: # 2. latexindent.exe # build-windows-exe: - name: 'create Windows executable latexindent.exe using Strawberry Perl 5.32 on Windows' + name: 'create Windows executable latexindent.exe using Windows Perl (latest) on Windows' runs-on: 'windows-latest' steps: # @@ -74,11 +74,10 @@ jobs: # # https://github.com/marketplace/actions/setup-perl-environment # - - name: install Strawberry Perl + - name: install Perl uses: shogo82148/actions-setup-perl@v1 with: - perl-version: '5.32' - distribution: strawberry + perl-version: 'latest' - name: install Perl modules using cpan run: | wmic os get osarchitecture @@ -137,7 +136,7 @@ jobs: - name: install Perl uses: shogo82148/actions-setup-perl@v1 with: - perl-version: '5.32' + perl-version: 'latest' - name: install Perl modules using cpan run: | cpanm -f PAR::Packer @@ -192,7 +191,7 @@ jobs: - name: install Perl uses: shogo82148/actions-setup-perl@v1 with: - perl-version: '5.32' + perl-version: 'latest' - name: install Perl modules using cpan run: | cpanm -f PAR::Packer diff --git a/.github/workflows/test-cases-on-pull.yaml b/.github/workflows/test-cases-on-pull.yaml index 62b92e80..6362ceca 100644 --- a/.github/workflows/test-cases-on-pull.yaml +++ b/.github/workflows/test-cases-on-pull.yaml @@ -69,7 +69,7 @@ jobs: - name: installing Perl uses: shogo82148/actions-setup-perl@v1 with: - perl-version: 5.34 + perl-version: 'latest' - name: installing perl modules for latexindent.pl run: | cpanm YAML::Tiny From 835b4a1a00222627ff3a38e23306f924abc5ace2 Mon Sep 17 00:00:00 2001 From: cmhughes Date: Sat, 6 Apr 2024 17:43:49 +0100 Subject: [PATCH 4/4] V3.23.9 --- Dockerfile | 2 +- LatexIndent/Version.pm | 4 ++-- defaultSettings.yaml | 2 +- documentation/changelog.md | 4 +++- documentation/conf.py | 4 ++-- documentation/demonstrations/pre-commit-config-conda.yaml | 2 +- documentation/demonstrations/pre-commit-config-cpan.yaml | 2 +- documentation/demonstrations/pre-commit-config-demo.yaml | 2 +- .../demonstrations/pre-commit-config-docker.yaml | 2 +- documentation/latexindent-yaml-schema.json | 2 +- documentation/readme.txt | 2 +- documentation/title.tex | 4 ++-- helper-scripts/update-version.sh | 8 ++++---- latexindent.pl | 2 +- readme.md | 4 ++-- 15 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index bf67eecb..e0edbf52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ FROM perl:5.38.2-slim-threaded-buster # ARG LATEXINDENT_VERSION -ENV LATEXINDENT_VERSION ${LATEXINDENT_VERSION:-V3.23.8} +ENV LATEXINDENT_VERSION ${LATEXINDENT_VERSION:-V3.23.9} RUN apt-get update \ && apt-get install \ diff --git a/LatexIndent/Version.pm b/LatexIndent/Version.pm index 69f0226e..bbfb2e7e 100644 --- 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.23.8'; -our $versionDate = '2024-03-28'; +our $versionNumber = '3.23.9'; +our $versionDate = '2024-04-06'; 1 diff --git a/defaultSettings.yaml b/defaultSettings.yaml index 18031bb0..257216f6 100644 --- a/defaultSettings.yaml +++ b/defaultSettings.yaml @@ -1,5 +1,5 @@ # -# latexindent.pl, version 3.23.8, 2024-03-28 +# latexindent.pl, version 3.23.9, 2024-04-06 # # defaultSettings.yaml, the default settings for latexindent.pl # diff --git a/documentation/changelog.md b/documentation/changelog.md index 28c70727..70f2c710 100644 --- a/documentation/changelog.md +++ b/documentation/changelog.md @@ -1,6 +1,8 @@ - + # changelog.md +## V3.23.9, April 6, 2024 +`latexindent.exe` oneSentencePerLine bug fix, see [issue 514](https://github.com/cmhughes/latexindent.pl/issues/514) ## V3.23.8, March 28, 2024 STDIN and GCString update, see [issue 528](https://github.com/cmhughes/latexindent.pl/issues/528) and [issue 531](https://github.com/cmhughes/latexindent.pl/issues/531); thanks to @Mikachu2333 and @saxyx diff --git a/documentation/conf.py b/documentation/conf.py index b7656b0d..4eb525a2 100644 --- a/documentation/conf.py +++ b/documentation/conf.py @@ -63,9 +63,9 @@ # built documents. # # The short X.Y version. -version = u'3.23.8' +version = u'3.23.9' # The full version, including alpha/beta/rc tags. -release = u'3.23.8' +release = u'3.23.9' # 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 index 90920432..2a922bb1 100644 --- 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.23.8 + rev: V3.23.9 hooks: - id: latexindent-conda args: [-s] diff --git a/documentation/demonstrations/pre-commit-config-cpan.yaml b/documentation/demonstrations/pre-commit-config-cpan.yaml index d7cef2b6..b093c8ea 100644 --- 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.23.8 + rev: V3.23.9 hooks: - id: latexindent args: [-s] diff --git a/documentation/demonstrations/pre-commit-config-demo.yaml b/documentation/demonstrations/pre-commit-config-demo.yaml index 8baa6739..36c7becf 100644 --- 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.23.8 + rev: V3.23.9 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 index be80a0ab..adb9e880 100644 --- 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.23.8 + rev: V3.23.9 hooks: - id: latexindent-docker args: [-s] diff --git a/documentation/latexindent-yaml-schema.json b/documentation/latexindent-yaml-schema.json index 65f59688..56ffbc24 100644 --- 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.23.8 2024-03-28", + "description": "latexindent.pl YAML schema helper, V3.23.9 2024-04-06", "type": "object", "properties": { "fileExtensionPreference": { diff --git a/documentation/readme.txt b/documentation/readme.txt index a7d62382..77bc3fb9 100644 --- a/documentation/readme.txt +++ b/documentation/readme.txt @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - latexindent.pl, version 3.23.8, 2024-03-28 + latexindent.pl, version 3.23.9, 2024-04-06 PERL script to indent code within environments, and align delimited environments in .tex files. diff --git a/documentation/title.tex b/documentation/title.tex index d4ba5eb4..8078b4e8 100644 --- 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.23.8 + \centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.23.9 \end{tcolorbox} } \author{Chris Hughes \thanks{and contributors! See \vref{sec:contributors}. For all communication, please visit \cite{latexindent-home}.}} -\date{2024-03-28} +\date{2024-04-06} \maketitle \begin{adjustwidth}{1cm}{1cm} \small diff --git a/helper-scripts/update-version.sh b/helper-scripts/update-version.sh index 73f68104..9c895e4a 100755 --- a/helper-scripts/update-version.sh +++ b/helper-scripts/update-version.sh @@ -44,10 +44,10 @@ # - minorVersion=0 -oldVersion='3.23.7' -newVersion='3.23.8' -oldDate='2024-03-16' -newDate='2024-03-28' +oldVersion='3.23.8' +newVersion='3.23.9' +oldDate='2024-03-28' +newDate='2024-04-06' updateVersion=0 gitMode=0 diff --git a/latexindent.pl b/latexindent.pl index c973cc45..194b1305 100755 --- a/latexindent.pl +++ b/latexindent.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# latexindent.pl, version 3.23.8, 2024-03-28 +# latexindent.pl, version 3.23.9, 2024-04-06 # # 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 index 9b5b38b1..cd164b1c 100644 --- 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.23.8, 2024-03-28 + latexindent.pl, version 3.23.9, 2024-04-06 ## 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.23.8 + rev: V3.23.9 hooks: - id: latexindent ```