Merge branch 'master' into env-locale

Includes refactoring the work in this branch to use the approch taken
later in master vis-a-vis the rusile module.

.cirrus.yml

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

.commitlintrc.yml

@@ -51,6 +51,7 @@ rules:
     - pdf
     - readme
     - release
+    - rusile
     - settings
     - shapers
     - tooling

.editorconfig

@@ -24,7 +24,7 @@ max_line_length = 120
 
 # StyLua keys
 collapse_simple_statement = never
-space_after_functions = definitions
+space_after_function_names = definitions
 
 # EmmyLuaCodeStyle keys
 continuation_indent = 6

.github/workflows/build.yml

@@ -49,7 +49,7 @@ jobs:
           ./bootstrap.sh
           ./configure \
             --enable-developer-mode \
-            BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false \
+            BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false TYPOS=cat \
             --disable-font-variations \
             --with-manual \
             ${{ matrix.configuration[1] }}
@@ -63,18 +63,18 @@ jobs:
         run: |
           make dist
       - name: Upload source dist artifact
-        if: ${{ matrix.configuration[0] == 'dynamic' && !contains(github.ref, 'refs/tags/v') }}
+        if: matrix.configuration[0] == 'dynamic' && !startsWith(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' }}
+        if: matrix.configuration[0] == 'static'
         run: |
           cp sile sile-${{ env.CARCH }}
           sha256sum sile-${{ env.CARCH }} | tee -a sile-${{ env.VERSION }}.sha256.txt
       - name: Upload static binary artifact
-        if: ${{ matrix.configuration[0] == 'static' && !contains(github.ref, 'refs/tags/v') }}
+        if: matrix.configuration[0] == 'static' && !startsWith(github.ref, 'refs/tags/v')
         uses: actions/upload-artifact@v4
         with:
           name: sile-${{ env.CARCH }}
@@ -91,6 +91,43 @@ jobs:
             sile-${{ env.CARCH }}
             sile-${{ env.VERSION }}.sha256.txt
 
+  build-from-dist:
+    runs-on: ubuntu-22.04
+    name: Build from source tarball without automake
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Cache lua_modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            lua_modules
+          key: luarocks-${{ hashFiles('Makefile-luarocks', 'sile.rockspec.in') }}
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install jq libarchive-tools libfontconfig1-dev libharfbuzz-dev libicu-dev libluajit-5.1-dev libpng-dev luajit lua-sec lua-socket lua-zlib-dev luarocks
+      - name: Configure
+        run: |
+          ./bootstrap.sh
+          ./configure \
+            --enable-developer-mode \
+            BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false TYPOS=cat FCMATCH=true PDFINFO=false CARGO=true \
+            --disable-font-variations \
+            --with-system-lua-sources \
+            --without-manual
+          echo "VERSION=$(./build-aux/git-version-gen .tarball-version)" >> $GITHUB_ENV
+          echo "MAKEFLAGS=-j$(nproc) -Otarget" >> $GITHUB_ENV
+      - name: Package
+        run: |
+          make fake-manual
+          make distdir
+      - name: Build from dist tree
+        run: |
+          make docker-test-dist
+
   build-nix:
     runs-on: ubuntu-22.04
     name: Build Nix
@@ -107,9 +144,9 @@ jobs:
             .sources
           key: fonts-${{ hashFiles('Makefile-fonts') }}
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v12
+        uses: DeterminateSystems/nix-installer-action@v15
       - name: Cache Nix dependencies
-        uses: DeterminateSystems/magic-nix-cache-action@v7
+        uses: DeterminateSystems/magic-nix-cache-action@v8
       - name: Setup developer environment
         run: |
           nix develop --command ./bootstrap.sh

.github/workflows/coverage.yml

@@ -33,12 +33,12 @@ jobs:
             lua_modules
           key: luarocks-luajit-${{ hashFiles('Makefile-luarocks', 'sile.rockspec.in') }}
       - name: Setup ‘lua’
-        uses: leafo/gh-actions-lua@v10
+        uses: hishamhm/gh-actions-lua@master
         with:
           luaVersion: luajit
           luaCompileFlags: XCFLAGS=-fPIC
       - name: Setup ‘luarocks’
-        uses: leafo/gh-actions-luarocks@v4
+        uses: hishamhm/gh-actions-luarocks@master
       - name: Prep system Lua for use
         run: |
           luarocks install busted
@@ -60,7 +60,7 @@ jobs:
         run: |
           ./bootstrap.sh
           ./configure \
-            --enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false \
+            --enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TYPOS=false \
             --disable-font-variations \
             --without-manual
       - name: Make

.github/workflows/deploy.yml

@@ -42,7 +42,8 @@ jobs:
             LUAROCKS=false \
             NIX=false \
             PDFINFO=false \
-            STYLUA=false
+            STYLUA=false \
+            TYPOS=false
       - name: Publish Docker Image to GH Container Registry
         run: |
           make docker-build-push

.github/workflows/nix.yml

@@ -16,9 +16,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v12
+        uses: DeterminateSystems/nix-installer-action@v15
       - name: Cache Nix dependencies
-        uses: DeterminateSystems/magic-nix-cache-action@v7
+        uses: DeterminateSystems/magic-nix-cache-action@v8
       # Upstream package sometimes has flags set that disable flake checking
       - name: Setup test env
         run: |

.github/workflows/test.yml

@@ -46,14 +46,14 @@ jobs:
           sudo apt-get update
           sudo apt-get install fonts-sil-gentiumplus libarchive-tools libfontconfig1-dev libharfbuzz-dev libicu-dev libpng-dev poppler-utils
       - name: Setup ‘lua’
-        uses: leafo/gh-actions-lua@v10
+        uses: hishamhm/gh-actions-lua@master
         with:
           luaVersion: ${{ matrix.luaVersion[0] }}
           luaCompileFlags: ${{ matrix.luaVersion[1] }}
       - name: Setup ‘cargo’
         uses: actions-rs/toolchain@v1
       - name: Setup ‘luarocks’
-        uses: leafo/gh-actions-luarocks@v4
+        uses: hishamhm/gh-actions-luarocks@master
       - name: Prep system Lua for use
         run: |
           luarocks install busted
@@ -71,7 +71,7 @@ jobs:
           ./bootstrap.sh
           ./configure \
             ${{ matrix.luaVersion[1] }} \
-            --enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false \
+            --enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TYPOS=false \
             --disable-font-variations \
             --with${{ !startsWith(matrix.luaVersion[0], 'luajit') && 'out' || '' }}-luajit \
             --without-system-luarocks \

.gitignore

@@ -21,7 +21,9 @@ build-aux/ltsugar.m4
 build-aux/ltversion.m4
 build-aux/lt~obsolete.m4
 build-aux/missing
-build-aux/list-dist-files.sh
+build-aux/import-tex-hyphens.sh
+build-aux/list-distfiles.sh
+build-aux/transpile-tex-hyphen-patterns.lua
 tests/regressions.pl
 
 # Other autojunk
@@ -88,17 +90,18 @@ sile-lua.1
 .version
 .version-prev
 .tarball-version
+.flake-version
 .built-subdirs
 *.so
 *.o
-core/version.lua
-core/features.lua
-target/
 completions/
+core/features.lua
 core/pathsetup.lua
-src/embed.rs
+core/version.lua
 src/embed-includes.rs
+src/embed.rs
 src/sile-entry.sh
+target/
 *.asc
 
 # Nix symlink to builds

.styluaignore

@@ -2,3 +2,4 @@ lua_modules
 lua-libraries
 core/features.lua
 core/pathsetup.lua
+core/version.lua