From ded845ec34f920528404ac631f12b6f49b373787 Mon Sep 17 00:00:00 2001 From: Tobias Schmitz Date: Thu, 31 Jul 2025 13:49:48 +0200 Subject: [PATCH] chore: update krilla --- Cargo.lock | 85 +++++++++++++++++++----------- crates/typst-pdf/src/tags/table.rs | 4 +- 2 files changed, 55 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 866bd1b86..600f25155 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -454,12 +454,25 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df6916408a724339aa77b18214233355f3eb04c42eb895e5f8909215bd8a7a91" dependencies = [ - "comemo-macros", + "comemo-macros 0.4.0", "once_cell", "parking_lot", "siphasher", ] +[[package]] +name = "comemo" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "649d7b2d867b569729c03c0f6968db10bc95921182a1f2b2012b1b549492f39d" +dependencies = [ + "comemo-macros 0.5.0", + "parking_lot", + "rustc-hash", + "siphasher", + "slab", +] + [[package]] name = "comemo-macros" version = "0.4.0" @@ -471,6 +484,17 @@ dependencies = [ "syn", ] +[[package]] +name = "comemo-macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51c87fc7e85487493ddedae1a3a34b897c77ad8825375b79265a8a162c28d535" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -867,15 +891,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "getopts" version = "0.2.21" @@ -1430,14 +1445,13 @@ dependencies = [ [[package]] name = "krilla" version = "0.4.0" -source = "git+https://github.com/LaurenzV/krilla?branch=main#576fb4f95d975ce366f18ad552a62286f6fbd0ec" +source = "git+https://github.com/LaurenzV/krilla?branch=main#1246755ed5ff18a9a8c888694e4b91f3bed1b41a" dependencies = [ "base64", "bumpalo", - "comemo", + "comemo 0.5.0", "flate2", "float-cmp 0.10.0", - "fxhash", "gif", "hayro-write", "image-webp", @@ -1446,6 +1460,7 @@ dependencies = [ "pdf-writer", "png", "rayon", + "rustc-hash", "rustybuzz", "siphasher", "skrifa", @@ -1460,7 +1475,7 @@ dependencies = [ [[package]] name = "krilla-svg" version = "0.1.0" -source = "git+https://github.com/LaurenzV/krilla?branch=main#576fb4f95d975ce366f18ad552a62286f6fbd0ec" +source = "git+https://github.com/LaurenzV/krilla?branch=main#1246755ed5ff18a9a8c888694e4b91f3bed1b41a" dependencies = [ "flate2", "fontdb", @@ -2286,9 +2301,9 @@ dependencies = [ [[package]] name = "rustc-hash" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustix" @@ -2515,6 +2530,12 @@ dependencies = [ "read-fonts", ] +[[package]] +name = "slab" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" + [[package]] name = "slotmap" version = "1.0.7" @@ -2604,11 +2625,11 @@ dependencies = [ [[package]] name = "subsetter" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35539e8de3dcce8dd0c01f3575f85db1e5ac1aea1b996d2d09d89f148bc91497" +checksum = "35725d9d2d056905865f8a36146e45be43691b15fc5d973bd7f79dd438288544" dependencies = [ - "fxhash", + "rustc-hash", ] [[package]] @@ -2920,7 +2941,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" name = "typst" version = "0.13.1" dependencies = [ - "comemo", + "comemo 0.4.0", "ecow", "typst-eval", "typst-html", @@ -2948,7 +2969,7 @@ dependencies = [ "clap_mangen", "codespan-reporting", "color-print", - "comemo", + "comemo 0.4.0", "dirs", "ecow", "fs_extra", @@ -3016,7 +3037,7 @@ dependencies = [ name = "typst-eval" version = "0.13.1" dependencies = [ - "comemo", + "comemo 0.4.0", "ecow", "indexmap 2.7.1", "stacker", @@ -3033,7 +3054,7 @@ dependencies = [ name = "typst-fuzz" version = "0.13.1" dependencies = [ - "comemo", + "comemo 0.4.0", "libfuzzer-sys", "typst", "typst-assets", @@ -3046,7 +3067,7 @@ name = "typst-html" version = "0.13.1" dependencies = [ "bumpalo", - "comemo", + "comemo 0.4.0", "ecow", "palette", "time", @@ -3063,7 +3084,7 @@ dependencies = [ name = "typst-ide" version = "0.13.1" dependencies = [ - "comemo", + "comemo 0.4.0", "ecow", "once_cell", "pathdiff", @@ -3106,7 +3127,7 @@ dependencies = [ "az", "bumpalo", "codex", - "comemo", + "comemo 0.4.0", "ecow", "hypher", "icu_properties", @@ -3141,7 +3162,7 @@ dependencies = [ "chinese-number", "ciborium", "codex", - "comemo", + "comemo 0.4.0", "csv", "ecow", "flate2", @@ -3211,7 +3232,7 @@ version = "0.13.1" dependencies = [ "az", "bytemuck", - "comemo", + "comemo 0.4.0", "ecow", "image", "infer", @@ -3234,7 +3255,7 @@ version = "0.13.1" dependencies = [ "arrayvec", "bumpalo", - "comemo", + "comemo 0.4.0", "ecow", "regex", "typst-library", @@ -3249,7 +3270,7 @@ name = "typst-render" version = "0.13.1" dependencies = [ "bytemuck", - "comemo", + "comemo 0.4.0", "hayro", "image", "pixglyph", @@ -3267,7 +3288,7 @@ name = "typst-svg" version = "0.13.1" dependencies = [ "base64", - "comemo", + "comemo 0.4.0", "ecow", "flate2", "hayro", @@ -3303,7 +3324,7 @@ name = "typst-tests" version = "0.13.1" dependencies = [ "clap", - "comemo", + "comemo 0.4.0", "ecow", "krilla", "oxipng", diff --git a/crates/typst-pdf/src/tags/table.rs b/crates/typst-pdf/src/tags/table.rs index 592cb5550..c2f273130 100644 --- a/crates/typst-pdf/src/tags/table.rs +++ b/crates/typst-pdf/src/tags/table.rs @@ -180,14 +180,14 @@ impl TableCtx { let scope = table_header_scope(scope); Tag::TH(scope) .with_id(Some(id)) - .with_headers(cell.headers) + .with_headers(Some(cell.headers)) .with_row_span(rowspan) .with_col_span(colspan) .with_location(Some(cell.span.into_raw())) .into() } TableCellKind::Footer | TableCellKind::Data => Tag::TD - .with_headers(cell.headers) + .with_headers(Some(cell.headers)) .with_row_span(rowspan) .with_col_span(colspan) .with_location(Some(cell.span.into_raw()))