Merge upstream v0.11.1

Author: 3w36zj6

.github/workflows/ci.yml

@@ -4,6 +4,7 @@ on: [push, pull_request, merge_group]
 env:
   RUSTFLAGS: "-Dwarnings"
   RUSTDOCFLAGS: "-Dwarnings"
+  TYPST_TESTS_EXTENDED: true
 
 jobs:
   # This allows us to have one branch protection rule for the full test matrix.
@@ -29,16 +30,19 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@1.77.0
       - uses: Swatinem/rust-cache@v2
+      - run: cargo test --workspace --no-run
       - run: cargo test --workspace --no-fail-fast
 
   checks:
     name: Check clippy, formatting, and documentation
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/[email protected]
+        with:
+          components: clippy, rustfmt
       - uses: Swatinem/rust-cache@v2
       - run: cargo clippy --workspace --all-targets --all-features
       - run: cargo fmt --check --all
@@ -62,5 +66,5 @@ jobs:
         with:
           toolchain: nightly-2023-09-13
       - uses: Swatinem/rust-cache@v2
-      - run: cargo install cargo-fuzz
+      - run: cargo install --locked cargo-fuzz@0.12.0
       - run: cd tests/fuzz && cargo fuzz build --dev

.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: dtolnay/rust-toolchain@stable
+    - uses: dtolnay/rust-toolchain@1.77.0
       with:
         target: ${{ matrix.target }}
 

.gitignore

@@ -6,11 +6,8 @@ desktop.ini
 .DS_Store
 
 # Tests and benchmarks
-tests/png
-tests/pdf
-tests/svg
-tests/target
-tests/typ/**/*.pdf
+tests/store
+tests/suite/**/*.pdf
 tests/fuzz/target
 tests/fuzz/corpus
 tests/fuzz/artifacts
@@ -23,6 +20,7 @@ tarpaulin-report.html
 
 # Node
 node_modules
+tools/test-helper/dist
 package-lock.json
 
 # Nix

Cargo.lock

@@ -4,7 +4,7 @@ default-members = ["crates/typst-cli"]
 resolver = "2"
 
 [workspace.package]
-version = "0.11.0"
+version = "0.11.1"
 rust-version = "1.74" # also change in ci.yml
 authors = ["The Typst Project Developers"]
 edition = "2021"
@@ -16,17 +16,17 @@ keywords = ["typst"]
 readme = "README.md"
 
 [workspace.dependencies]
-typst = { path = "crates/typst", version = "0.11.0" }
-typst-cli = { path = "crates/typst-cli", version = "0.11.0" }
-typst-ide = { path = "crates/typst-ide", version = "0.11.0" }
-typst-macros = { path = "crates/typst-macros", version = "0.11.0" }
-typst-pdf = { path = "crates/typst-pdf", version = "0.11.0" }
-typst-render = { path = "crates/typst-render", version = "0.11.0" }
-typst-svg = { path = "crates/typst-svg", version = "0.11.0" }
-typst-syntax = { path = "crates/typst-syntax", version = "0.11.0" }
-typst-timing = { path = "crates/typst-timing", version = "0.11.0" }
-typst-assets = "0.11.0"
-typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", tag = "v0.11.0" }
+typst = { path = "crates/typst", version = "0.11.1" }
+typst-cli = { path = "crates/typst-cli", version = "0.11.1" }
+typst-ide = { path = "crates/typst-ide", version = "0.11.1" }
+typst-macros = { path = "crates/typst-macros", version = "0.11.1" }
+typst-pdf = { path = "crates/typst-pdf", version = "0.11.1" }
+typst-render = { path = "crates/typst-render", version = "0.11.1" }
+typst-svg = { path = "crates/typst-svg", version = "0.11.1" }
+typst-syntax = { path = "crates/typst-syntax", version = "0.11.1" }
+typst-timing = { path = "crates/typst-timing", version = "0.11.1" }
+typst-assets = "0.11.1"
+typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", tag = "v0.11.1" }
 az = "1.2"
 base64 = "0.22"
 bitflags = { version = "2", features = ["serde"] }
@@ -47,7 +47,7 @@ env_proxy = "0.4"
 flate2 = "1"
 fontdb = { version = "0.16", default-features = false }
 fs_extra = "1.3"
-hayagriva = "0.5.2"
+hayagriva = "0.5.3"
 heck = "0.4"
 hypher = "0.1.4"
 icu_properties = { version = "1.4", features = ["serde"] }
@@ -94,6 +94,7 @@ semver = "1"
 serde = { version = "1.0.184", features = ["derive"] }
 serde_json = "1"
 serde_yaml = "0.9"
+shell-escape = "0.1.5"
 siphasher = "1"
 smallvec = { version = "1.11.1", features = ["union", "const_generics", "const_new"] }
 stacker = "0.1.15"

Cargo.toml

@@ -15,9 +15,6 @@ readme = { workspace = true }
 [[bin]]
 name = "typst"
 path = "src/main.rs"
-test = false
-doctest = false
-bench = false
 doc = false
 
 [dependencies]
@@ -51,6 +48,7 @@ semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
+shell-escape = { workspace = true }
 tar = { workspace = true }
 tempfile = { workspace = true }
 toml = { workspace = true }

crates/typst-cli/Cargo.toml

@@ -104,11 +104,19 @@ fn print_summary(
     out.set_color(&gray)?;
     write!(out, "> ")?;
     out.reset()?;
-    writeln!(out, "cd {}", project_dir.display())?;
+    writeln!(
+        out,
+        "cd {}",
+        shell_escape::escape(project_dir.display().to_string().into()),
+    )?;
     out.set_color(&gray)?;
     write!(out, "> ")?;
     out.reset()?;
-    writeln!(out, "typst watch {}", template.entrypoint)?;
+    writeln!(
+        out,
+        "typst watch {}",
+        shell_escape::escape(template.entrypoint.to_string().into()),
+    )?;
     writeln!(out)?;
     Ok(())
 }

crates/typst-cli/src/init.rs

@@ -26,7 +26,7 @@ use crate::timings::Timer;
 
 thread_local! {
     /// The CLI's exit code.
-    static EXIT: Cell<ExitCode> = Cell::new(ExitCode::SUCCESS);
+    static EXIT: Cell<ExitCode> = const { Cell::new(ExitCode::SUCCESS) };
 }
 
 /// The parsed commandline arguments.

crates/typst-cli/src/main.rs

@@ -226,7 +226,7 @@ struct FileSlot {
 }
 
 impl FileSlot {
-    /// Create a new path slot.
+    /// Create a new file slot.
     fn new(id: FileId) -> Self {
         Self { id, file: SlotCell::new(), source: SlotCell::new() }
     }

crates/typst-cli/src/world.rs

@@ -12,11 +12,6 @@ categories = { workspace = true }
 keywords = { workspace = true }
 readme = { workspace = true }
 
-[lib]
-test = false
-doctest = false
-bench = false
-
 [dependencies]
 typst = { workspace = true }
 comemo = { workspace = true }
@@ -26,5 +21,10 @@ log = { workspace = true }
 serde = { workspace = true }
 unscanny = { workspace = true }
 
+[dev-dependencies]
+typst-assets = { workspace = true }
+typst-dev-assets = { workspace = true }
+once_cell = { workspace = true }
+
 [lints]
 workspace = true