Merge remote-tracking branch 'upstream/develop' into deprecate-script

.cirrus.yml

@@ -43,7 +43,7 @@ task:
     - ./bootstrap.sh
   configure_script: |
     ./configure MAKE=gmake \
-      --enable-developer LUAROCKS=false LUACHECK=false BUSTED=false PDFINFO=false NIX=false \
+      --enable-developer LUAROCKS=false LUACHECK=false BUSTED=false DELTA=cat PDFINFO=false NIX=false \
       --disable-font-variations \
       --with-system-lua-sources \
       --with-system-luarocks \

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # Default
-*	@alerque @simoncozens
+*	@alerque
 
 # Language expertise
 languages/fr*	@sile-typesetter/lang-fr

.github/workflows/build.yml

@@ -13,8 +13,9 @@ jobs:
       matrix:
         configuration:
           - [ 'dynamic', '' ]
-          - [ 'embeded', '--enable-embeded-resources' ]
           - [ 'system', '--with-system-lua-sources' ]
+          - [ 'embeded', '--enable-embeded-resources' ]
+          - [ 'static', '--enable-embeded-resources --disable-shared --enable-static' ]
     runs-on: ubuntu-22.04
     name: Build Ubuntu ${{ matrix.configuration[0] }}
     steps:
@@ -52,27 +53,39 @@ jobs:
             ${{ matrix.configuration[1] }}
           echo "VERSION=$(./build-aux/git-version-gen .tarball-version)" >> $GITHUB_ENV
           echo "MAKEFLAGS=-j$(nproc) -Otarget" >> $GITHUB_ENV
+          echo "CARCH=$(uname -m)" >> $GITHUB_ENV
       - name: Make
         run: |
           make
       - name: Package
         run: |
           make dist
-      - name: Upload artifacts
-        if: ${{ !contains(github.ref, 'refs/tags/v') }}
-        uses: actions/upload-artifact@v3
+      - name: Upload source dist artifact
+        if: ${{ matrix.configuration[0] == 'dynamic' && !contains(github.ref, 'refs/tags/v') }}
+        uses: actions/upload-artifact@v4
         with:
           name: sile-${{ env.VERSION }}
           path: sile-${{ env.VERSION }}.zip
+      - name: Append architecture to static binary
+        if: ${{ matrix.configuration[0] == 'static' }}
+        run: |
+          cp sile sile-${{ env.CARCH }}
+      - name: Upload static binary artifact
+        if: ${{ matrix.configuration[0] == 'static' && !contains(github.ref, 'refs/tags/v') }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: sile-${{ env.CARCH }}
+          path: sile-${{ env.CARCH }}
       - name: Release
         uses: softprops/action-gh-release@v1
-        if: github.repository == 'sile-typesetter/sile' && startsWith(github.ref, 'refs/tags/v')
+        if: matrix.configuration[0] == 'static' && github.repository == 'sile-typesetter/sile' && startsWith(github.ref, 'refs/tags/v')
         with:
           body_path: sile-${{ env.VERSION }}.md
           files: |
             sile-${{ env.VERSION }}.pdf
             sile-${{ env.VERSION }}.zip
             sile-${{ env.VERSION }}.tar.xz
+            sile-${{ env.CARCH }}
 
   build-nix:
     runs-on: ubuntu-22.04
@@ -90,14 +103,14 @@ jobs:
             .sources
           key: fonts-${{ hashFiles('Makefile-fonts') }}
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v6
+        uses: DeterminateSystems/nix-installer-action@v9
       - name: Cache Nix dependencies
         uses: DeterminateSystems/magic-nix-cache-action@v2
       - name: Setup developer environment
         run: |
           nix develop --command ./bootstrap.sh
           nix develop --configure
           nix develop --command make
-      - name: Run HB6+ only regressions
+      - name: Run regression tests for which Ubuntu can't provide deps
         run: |
-          nix develop --command make regressions TESTSRCS=tests/variations-axis.sil
+          nix develop --command make regressions TESTSRCS='tests/variations-axis.sil tests/feat-unicode-softhyphen.sil'

.github/workflows/coverage.yml

@@ -60,7 +60,7 @@ jobs:
         run: |
           ./bootstrap.sh
           ./configure \
-            --enable-developer LUACHECK=false NIX=false \
+            --enable-developer LUACHECK=false NIX=false DELTA=cat \
             --disable-font-variations \
             --without-manual
       - name: Make

.github/workflows/nix.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v6
+        uses: DeterminateSystems/nix-installer-action@v9
       - name: Cache Nix dependencies
         uses: DeterminateSystems/magic-nix-cache-action@v2
       # Upstream package sometimes has flags set that disable flake checking

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
           - [ '5.2', 'MYCFLAGS=-fPIC' ]
           - [ '5.1', 'CFLAGS="-O2 -Wall -DLUA_USE_LINUX -fPIC"' ]
           - [ 'luajit', 'XCFLAGS=-fPIC' ]
-          # - [ 'luajit-openresty', 'XCFLAGS=-fPIC' ]
+          - [ 'luajit-openresty', 'XCFLAGS=-fPIC' ]
     runs-on: ubuntu-22.04
     name: Test on Lua ${{ matrix.luaVersion[0] }}
     steps:
@@ -71,9 +71,10 @@ jobs:
           ./bootstrap.sh
           ./configure \
             ${{ matrix.luaVersion[1] }} \
-            --enable-developer LUACHECK=false NIX=false \
+            --enable-developer LUACHECK=false NIX=false DELTA=cat \
             --disable-font-variations \
             --with${{ !startsWith(matrix.luaVersion[0], 'luajit') && 'out' || '' }}-luajit \
+            --without-system-luarocks \
             --without-manual
       - name: Make
         run: |
@@ -95,7 +96,7 @@ jobs:
         run: |
           make cargo-test
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-${{ matrix.luaVersion[0] }}-actuals
           path: tests/*.actual

.luacheckrc

@@ -1,4 +1,4 @@
-std = "max"
+std = "min"
 include_files = {
   "**/*.lua",
   "sile.in",
@@ -21,6 +21,7 @@ files["**/*_spec.lua"] = {
   std = "+busted"
 }
 globals = {
+  package = { fields = { "searchpath" } },
   "SILE",
   "SU",
   "luautf8",

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.14.14](https://github.com/sile-typesetter/sile/compare/v0.14.13...v0.14.14) (2023-12-23)
+
+
+### Features
+
+* **cli:** Change module load error to suggestion for how to install 3rd party modules ([c280050](https://github.com/sile-typesetter/sile/commit/c2800505eda2ee1630eea931f88efb07f6892d00))
+* **languages:** U+00A0 non-breaking space must be stretchable by default ([b769a63](https://github.com/sile-typesetter/sile/commit/b769a633069db4f32746d920dc9696296c7ab7db))
+* **typesetters:** Support U+00AD soft hyphen as discretionary break ([285507e](https://github.com/sile-typesetter/sile/commit/285507e5fddf3b0c752bb2b5bf81e8bf7f19144a))
+
+
+### Bug Fixes
+
+* **backends:** Fix plain text backend to work in LuaJIT/Lua 5.1 ([b185d49](https://github.com/sile-typesetter/sile/commit/b185d4972a5f29e7441f7af34e1ac49f49e6747f))
+* **cli:** Stop outputting error messages twice on failure to process main file ([da5d609](https://github.com/sile-typesetter/sile/commit/da5d60902a4129deb79ae4658ba82757d7277b85))
+* **core:** Use nil-safe and Lua-version-robust table utils ([2405b23](https://github.com/sile-typesetter/sile/commit/2405b23f0f448b217a066ecb34cae54f3e63aa64))
+* **packages:** Adjust dropcap logic for letters with a depth ([fd6963d](https://github.com/sile-typesetter/sile/commit/fd6963d226cc6a3b325dd796414936d200ae1ed2))
+
 ### [0.14.13](https://github.com/sile-typesetter/sile/compare/v0.14.12...v0.14.13) (2023-10-30)