Update LTG

.github/workflows/update-files.yml

@@ -1,11 +1,12 @@
 name: Update Files
 on:
+  pull_request:
   push:
     branches:
-      - update-ltg
+      - main
   workflow_dispatch:
 concurrency:
-  group: update-files
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 jobs:
   generatetex:
@@ -21,16 +22,17 @@ jobs:
         examples: [true]
     steps:
       - name: Set up Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
-          path: 'code'
-      - uses: actions/setup-node@v3
-      - name: Update npm
-        run: npm i -g npm@latest
-      - run: npm i npm@latest
+          ref: '${{ github.event.pull_request.head.ref }}'
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: 'generator-latex-template/package-lock.json'
       - name: Make generator available globally
-        working-directory: ${{ github.workspace }}/code/generator-latex-template
+        working-directory: ${{ github.workspace }}/generator-latex-template
         run: |
           npm install
           npm link
@@ -40,15 +42,15 @@ jobs:
         shell: bash
         working-directory: /tmp/ltg
         run: |
-          yo latex-template\
+          yo $GITHUB_WORKSPACE/generator-latex-template/generators/app/index.js \
            --githubpublish\
-           --docker=reitzig\
+           --docker=iot\
            --documentclass=lncs\
            --papersize=a4\
-           --latexcompiler=pdflatex\
+           --latexcompiler=both\
            --bibtextool=bibtex\
            --overleaf=true\
-           --texlive=2022\
+           --texlive=2024\
            --lang=${{ matrix.language }}\
            --font=${{ matrix.font }}\
            --listings=${{ matrix.listings }}\
@@ -58,7 +60,7 @@ jobs:
            --examples=${{ matrix.examples }}\
            --howtotext=false
         env:
-          yeoman_test: true
+          yeoman_test: false
       - name: Prepare files
         working-directory: /tmp/ltg
         run: |
@@ -78,76 +80,60 @@ jobs:
           rm _latexmkrc
 
           # copy everything
-          cp -r * ${{ github.workspace }}/code/
+          cp -r * ${{ github.workspace }}
 
           # output current status
-          cd ${{ github.workspace }}/code/
+          cd ${{ github.workspace }}
           git status
           git diff
       - name: Commit changes
-        uses: EndBug/add-and-commit@v8
+        uses: EndBug/add-and-commit@v9
         with:
           message: 'Update files based on generated files by template generator'
           committer_email: [email protected]
           push: false
-          cwd: 'code'
       - name: Push changes
         run: |
-          cd code
-          git status
           parallel --retries 10 --delay 9 ::: "git status && git pull --rebase && git push"
   publish:
     runs-on: ubuntu-latest
     needs: [generatetex]
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000
     steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          driver-opts: network=host
-      - name: Build Docker image
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          provenance: false
-          tags: localhost:5000/name/app:latest
-      - name: Set up Git repository
-        uses: actions/checkout@v3
+      - name: Set up Git repositor4
+        uses: actions/checkout@v4
       - run: |
           cp paper-en-default-listings.tex paper.tex
           cp paper-en-default-minted.tex paper-minted.tex
           cp paper-en-times-listings.tex paper-newtx.tex
           cp paper-en-times-minted.tex paper-minted-newtx.tex
-          mkdir /tmp/out
           # use latexmkrc (which is disabled due to easy overleaf usage)
           cp _latexmkrc latexmkrc
-      - name: Build paper.tex
-        run: docker run -v $(pwd):/work/src -v /tmp/out:/work/out localhost:5000/name/app:latest work "latexmk paper.tex"
-      - name: Build paper-minted.tex
-        run: docker run -v $(pwd):/work/src -v /tmp/out:/work/out localhost:5000/name/app:latest work "latexmk paper-minted.tex"
-      - name: Build paper-newtx.tex
-        run: docker run -v $(pwd):/work/src -v /tmp/out:/work/out localhost:5000/name/app:latest work "latexmk paper-newtx.tex"
-      - name: Build paper-minted-newtx.tex
-        run: docker run -v $(pwd):/work/src -v /tmp/out:/work/out localhost:5000/name/app:latest work "latexmk paper-minted-newtx.tex"
+      - name: Install TeX Live
+        uses: zauguin/install-texlive@v3
+        with:
+          package_file: '${{ github.workspace }}/Texlivefile'
+      - name: Prepare latexmk
+        run: |
+          updmap -sys
+          texhash
+          tlmgr generate language --rebuild-sys
+      - run: latexmk paper.tex
+      - run: latexmk paper-minted.tex
+      - run: latexmk paper-newtx.tex
+      - run: latexmk paper-minted-newtx.tex
       - run: |
           mkdir publish
-          cp /tmp/out/*.pdf publish/
+          cp *.pdf publish/
           cp paper.tex publish/
           cp README.md publish/
           cp .github/_config.yml publish/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: publish
           path: publish/
       - name: Deploy
         if: github.ref == 'refs/heads/main'
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./publish

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 From 2022-03-01 onwards, versioning is done using [Calendar Versioning](https://calver.org/).
 
+## [Unreleased]
+
+### Changed
+
+- Compilation with both lualatex and pdflatex is possible. Defaults to lualatex.
+- Nicer gray scale for `minted` listings.
+- `Dockerfile` switched to [Island of TeX's docker image](https://gitlab.com/islandoftex/images/texlive#tex-live-docker-image) to enable easy addition of new LaTeX packages.
+
 ## [2022-06-06]
 
 ### Added
@@ -216,3 +224,5 @@ First release using semantic versioning.
 [1.1.1]: https://github.com/latextemplates/LNCS/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/latextemplates/LNCS/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/latextemplates/LNCS/releases/tag/1.0.0
+
+<!-- markdownlint-disable-file MD013 MD024 CHANGELOG-RULE-003 -->

Dockerfile

@@ -1,13 +1,8 @@
-FROM reitzig/texlive-base:2022.8
-RUN apk update && apk add --no-cache bash perl python3 py3-pip
-RUN pip3 install pygments
+FROM registry.gitlab.com/islandoftex/images/texlive:latest-basic
+WORKDIR /workdir
 
-# Emulate "Install dependencies" of "entrypoint work ..."
-RUN tlmgr update --self --repository http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2022/tlnet-final
-COPY Texlivefile /work/src
-RUN xargs tlmgr install --repository http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2022/tlnet-final < "/work/src/Texlivefile" &&\
-  sha256sum "/work/src/Texlivefile" > "/work/tmp/Texlivefile.sha" &&\
-  # make latexmk and texlogsieve available
-  tlmgr path add
-# use latest texlogsieve
-# RUN cd /usr/local/bin && wget https://gitlab.com/lago/texlogsieve/-/raw/main/texlogsieve?inline=false
+COPY Texlivefile /workdir/
+
+RUN xargs tlmgr install --repository https://tug.ctan.org/systems/texlive/tlnet/ < /workdir/Texlivefile
+
+RUN tlmgr path add

README.md

@@ -9,7 +9,7 @@ Note that this requires a working perl installation.
 
 In case something goes wrong, you can instruct the LaTeX compiler to stop at the first error:
 
-    pdflatex paper
+    lualatex paper
 
 ## Benefits
 
@@ -32,6 +32,7 @@ Following features are enabled in this template:
 - Modern packages such as [microtype], [cleveref], [csquotes], [hyperref], [hypcap], [upquote], [natbib], [booktabs].
 - (Optional) LaTeX compilation using the modern lualatex compiler.
 - Ready-to-go configuration for [latexindent].
+- Proper hyphenation and microtype for English texts.
 
 ## Disabled features
 
@@ -84,18 +85,6 @@ To have minted running properly, you have to do following steps on Windows:
 2. Install [pygments]: `pip instal pygments` - that uses the Pyhton package manager to install the pygments library
 3. When latexing, use `-shell-escape`: `pdflatex -shell-escape paper`.
    You can also just execute `latexmk paper`.
-
-## Usage with docker
-
-The generated `Dockerfile` is based on the [Dockerfile by reitzig](https://github.com/reitzig/texlive-docker).
-The idea of that system is to host the document sources in a directory separated from the output directory.
-
-    docker run --rm -v "c:\users\example\latex-document:/work/src" -v "c:\users\example\latex-document\out:/work/out" ltg work latexmk
-
-Following one-time setup is requried:
-
-    docker build -t ltg .
-
 ## FAQs
 
 ### Q: ShareLaTeX outputs a warning regarding the llncs class
@@ -119,7 +108,7 @@ Please remove the file and update your LaTeX distribution.
 After that you can use and push the `main` branch as usual.
 Notes on syncing with the upstream repository [are available from GitHub](https://help.github.com/articles/syncing-a-fork/).
 
-### Q: I get the error  `! pdfTeX error (font expansion): auto expansion is only possible with scalable fonts.`
+### Q: I get the error `! pdfTeX error (font expansion): auto expansion is only possible with scalable fonts.`
 
 Install the `cm-super` package using the MiKTeX package manager. Then, run `initexmf --mkmaps` on the command line. (Long description: <https://tex.stackexchange.com/a/324972/9075>)
 
@@ -166,7 +155,6 @@ Yes. You can regenerate the template and choose "German" as language.
 - Other templates: <https://latextemplates.github.io/>
 
 [booktabs]: https://ctan.org/pkg/booktabs
-[cfr-lm]: https://www.ctan.org/pkg/cfr-lm
 [cleveref]: https://ctan.org/pkg/cleveref
 [csquotes]: https://www.ctan.org/pkg/csquotes
 [hypcap]: https://www.ctan.org/pkg/hypcap
@@ -175,7 +163,6 @@ Yes. You can regenerate the template and choose "German" as language.
 [microtype]: https://ctan.org/pkg/microtype
 [minted]: https://ctan.org/pkg/minted
 [natbib]: https://ctan.org/pkg/natbib
-[newtx]: https://ctan.org/pkg/newtx
 [paralist]: https://www.ctan.org/pkg/paralist
 [pdfcomment]: https://www.ctan.org/pkg/pdfcomment
 [upquote]: https://www.ctan.org/pkg/upquote