Merge c15e186 into d0a2a1e

.cirrus.yml

@@ -6,7 +6,7 @@ task:
       - image_family: freebsd-12-3
   env:
     MAKEFLAGS: -j$(nproc) -Otarget
-    CFLAGS: -I/usr/local/include -fPIC
+    CFLAGS: -I/usr/local/include
     LDFLAGS: -L/usr/local/lib
   assets_cache:
     folders:

.github/workflows/rust_lint.yml

@@ -20,7 +20,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
       - name: Run rustfmt
         run: |
-          git ls-files '*.rs' | xargs rustfmt --check
+          git ls-files '*.rs' '*.rs.in' | xargs rustfmt --check --config skip_children=true
 
   clippy:
     strategy:

.gitignore

@@ -88,11 +88,14 @@ sile-lua.1
 .tarball-version
 .built-subdirs
 *.so
+*.o
 core/version.lua
 core/features.lua
 target/
 completions/
 core/pathsetup.lua
+src/embed.rs
+src/embed-includes.rs
 
 # Nix symlink to builds
 result

Cargo.toml

@@ -15,6 +15,7 @@ homepage = "https://sile-typesetter.org"
 repository = "https://github.com/sile-typesetter/sile"
 license = "MIT"
 build = "build-aux/build.rs"
+# links = "svg"
 
 [[bin]]
 name = "sile"
@@ -28,6 +29,7 @@ lua52 = [ "mlua/lua52" ]
 lua51 = [ "mlua/lua51" ]
 luajit = [ "mlua/luajit" ]
 vendored = [ "mlua/vendored" ]
+static = [ "rust-embed" ]
 completions = [ "cli", "clap_complete" ]
 cli = [ "clap" ]
 bash = [ "completions" ]
@@ -54,6 +56,15 @@ lto = true
   version = "0.9"
   features = [ "macros" ]
 
+  [dependencies.rust-embed]
+  version = "8.0"
+  optional = true
+  features = [ "include-exclude" , "debug-embed" ]
+
+  [dependencies.harfbuzz-sys]
+  version = "0.5"
+  optional = true
+
 [build-dependencies]
 
   [build-dependencies.clap_complete]