diff --git a/Cargo.lock b/Cargo.lock index 04309d132..78d768ad2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1496,7 +1496,7 @@ checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" [[package]] name = "rusile" -version = "0.15.5" +version = "0.15.6" dependencies = [ "mlua", "sile", diff --git a/Cargo.toml b/Cargo.toml index c98d63ce7..f701a9bb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,25 +1,3 @@ -[workspace] -resolver = "2" -members = [ ".", "rusile" ] - - [workspace.package] - version = "0.15.5" - edition = "2021" - rust-version = "1.71.0" - authors = [ - "Simon Cozens", - "Caleb Maclennan ", - "Olivier Nicole", - "Didier Willis" -] - homepage = "https://sile-typesetter.org" - repository = "https://github.com/sile-typesetter/sile" - license = "MIT" - -[workspace.dependencies.mlua] -version = "0.10" -features = [ "anyhow" ] - [package] name = "sile" description = "Simon’s Improved Layout Engine" @@ -27,76 +5,52 @@ readme = "README.md" build = "build-aux/build.rs" version = "0.15.6" - [package.edition] - workspace = true - - [package.rust-version] - workspace = true - - [package.authors] - workspace = true +[workspace.package] +version = "0.15.6" +edition = "2021" +rust-version = "1.71.0" +authors = [ + "Simon Cozens", + "Caleb Maclennan ", + "Olivier Nicole", + "Didier Willis" +] +homepage = "https://sile-typesetter.org" +repository = "https://github.com/sile-typesetter/sile" +license = "MIT" - [package.homepage] - workspace = true +[workspace] +resolver = "2" +members = [ + ".", + "rusile" +] - [package.repository] - workspace = true +[package.edition] +workspace = true - [package.license] - workspace = true +[package.rust-version] +workspace = true -[package.metadata.bacon.jobs] -cmd = [ "cargo", "build", "--color", "always" ] +[package.authors] +workspace = true -[package.metadata.typos.default] -locale = "en-us" -extend-ignore-re = [ - "(?s)(#|//|--|%)\\s*typos: ignore start.*?\\n\\s*(#|//|--|%)\\s*typos: ignore end" -] -extend-ignore-identifiers-re = [ - "[a-f0-9]{7}", - "^.{2,3}$", - "^twords?", - "[Pp]arms", - "wdth", - "0fpt", - "^ot", - "^hb_ot", - "^HB_", - "^Tyre$", - "PoDoFo", - "_Flate", - "pointint", - "DEPENDEES", - "EPdf", - "FileAttachement" -] +[package.homepage] +workspace = true - [package.metadata.typos.default.extend-words] - beveled = "bevelled" - bevelled = "bevelled" - craters = "creators" - neet = "need" +[package.repository] +workspace = true -[package.metadata.typos.files] -ignore-hidden = false -extend-exclude = [ - "/.git", - "CHANGELOG.md", - "build-aux/ax*", - "languages/*/hyphens*", - "lua-libraries/*", - "lua_modules/*", - "node_modules/*", - "tests/*.expected", - "cmake/*.diff", - "libtexpdf" -] +[package.license] +workspace = true [[bin]] name = "sile" required-features = [ "cli" ] +[profile.release] +lto = true + [features] default = [ "cli", @@ -124,8 +78,13 @@ manpage = [ "clap_mangen" ] powershell = [ "completions" ] zsh = [ "completions" ] -[profile.release] -lto = true +[workspace.dependencies.mlua] +version = "0.10" +features = [ "anyhow" ] + +[workspace.dependencies.sile] +path = "." +version = "0.15.6" [dependencies.anyhow] version = "1.0" @@ -171,3 +130,48 @@ features = [ "build", "cargo", "git", "gitoxide" ] [package.metadata.docs.rs] features = [ "luajit", "vendored" ] + +[package.metadata.typos.default] +locale = "en-us" +extend-ignore-re = [ + "(?s)(#|//|--|%)\\s*typos: ignore start.*?\\n\\s*(#|//|--|%)\\s*typos: ignore end" +] +extend-ignore-identifiers-re = [ + "[a-f0-9]{7}", + "^.{2,3}$", + "^twords?", + "[Pp]arms", + "wdth", + "0fpt", + "^ot", + "^hb_ot", + "^HB_", + "^Tyre$", + "PoDoFo", + "_Flate", + "pointint", + "DEPENDEES", + "EPdf", + "FileAttachement" +] + +[package.metadata.typos.default.extend-words] +beveled = "bevelled" +bevelled = "bevelled" +craters = "creators" +neet = "need" + +[package.metadata.typos.files] +ignore-hidden = false +extend-exclude = [ + "/.git", + "CHANGELOG.md", + "build-aux/ax*", + "languages/*/hyphens*", + "lua-libraries/*", + "lua_modules/*", + "node_modules/*", + "tests/*.expected", + "cmake/*.diff", + "libtexpdf" +] diff --git a/rusile/Cargo.toml b/rusile/Cargo.toml index 8606b30ee..32ea2bc5a 100644 --- a/rusile/Cargo.toml +++ b/rusile/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rusile" description = "Rusty components for the SILE typesetter" -readme = "README.md" +readme = "../README.md" version.workspace = true edition.workspace = true rust-version.workspace = true @@ -11,10 +11,7 @@ repository.workspace = true license.workspace = true [lib] -crate-type = ["rlib", "cdylib", "staticlib"] - -[dependencies.sile] -path = ".." +crate-type = [ "rlib", "cdylib", "staticlib" ] [features] default = [] @@ -25,6 +22,9 @@ lua51 = [ "mlua/lua51" ] luajit = [ "mlua/luajit" ] vendored = [ "mlua/vendored" ] +[dependencies.sile] +workspace = true + [dependencies.mlua] workspace = true features = [ "macros", "module" ]