diff --git a/Cargo.lock b/Cargo.lock index 1af51632f3..ade2ab53c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,9 +120,9 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aes" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35f0f96ce78e38c3dc6d8948aa8163d06385be74000f3c7a95bf1eef35d3ea32" +checksum = "fc0fc36d7440d015b45468ba08a21e80e056ebbd014c611c6298bb7503e04bd1" dependencies = [ "cipher", "cpubits", @@ -452,9 +452,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-lc-rs" -version = "1.18.2" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faac5829c2b74c28f830747e7818ccfb684261b5f48a1118b1e2a13d36dfab13" +checksum = "048006790404103c488e6c5616b3e7e702a71292aadda08e8f7698a9e0d2eb53" dependencies = [ "aws-lc-sys", "untrusted 0.7.1", @@ -463,9 +463,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.46.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1622d8446a2d4b2ce0c7eefc73dd43a99779028d5ee5c2dd8073a658ba8a2bc" +checksum = "8bfbe32ac36b3c428696ce315464181bc4029d689fd58e3f2a4e58c252242f52" dependencies = [ "cc", "cmake", @@ -1417,7 +1417,7 @@ version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=e2dc681a3#e2dc681a3ad8a47038da2f11ddd2c5e1c0454991" dependencies = [ "fax", - "hayro-ccitt", + "hayro-ccitt 0.3.0", "hayro-jbig2", "thiserror 2.0.21", ] @@ -1938,7 +1938,7 @@ dependencies = [ "objc2-foundation 0.3.2", "parking_lot", "percent-encoding", - "pollster 1.0.1", + "pollster", "profiling", "raw-window-handle", "ron", @@ -2058,7 +2058,7 @@ dependencies = [ "image", "kittest", "log", - "pollster 1.0.1", + "pollster", "serde", "toml", "wgpu", @@ -2101,9 +2101,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.42" +version = "0.8.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e985e0451871ad22fb8d2b6b076e2028a502a0d3950998c2c5c0a4f9b5d9679" +checksum = "89253175e704ab869b04f9db224d38630e0211a53841a79181deae0889e169f5" dependencies = [ "cfg-if", "core_detect", @@ -2182,7 +2182,7 @@ dependencies = [ "emath", "epaint_default_fonts", "font-types 0.12.5", - "harfrust", + "harfrust 0.12.0", "log", "nohash-hasher", "parking_lot", @@ -2380,19 +2380,19 @@ checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe" [[package]] name = "flatbuffers" -version = "24.12.23" +version = "25.12.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1baf0dbf96932ec9a3038d57900329c015b0bfb7b63d904f3bc27e2b02a096" +checksum = "35f6839d7b3b98adde531effaf34f0c2badc6f4735d26fe74709d8e513a96ef3" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.13.2", "rustc_version", ] [[package]] name = "flate2" -version = "1.1.10" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" +checksum = "626d4928326b646e70f65ed36fc7cf9f206bdb68a0019ee7c6b4709da4e084c4" dependencies = [ "crc32fast", "miniz_oxide 0.9.1", @@ -2881,6 +2881,19 @@ dependencies = [ "smallvec", ] +[[package]] +name = "harfrust" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "948d0741125ba89cd3e1c23e5642415b6ade7e1d29d67ba25fb925b533e989d6" +dependencies = [ + "bitflags 2.13.2", + "bytemuck", + "once_cell", + "read-fonts 0.43.3", + "smallvec", +] + [[package]] name = "hashbrown" version = "0.14.5" @@ -2937,6 +2950,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f4d0e94ddd48749f06bbe4e5389fb9799a0c45bcaf00495042076ef05e3241a" +[[package]] +name = "hayro-ccitt" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adbed896e99325bc312778bb9c9c289d795d51c12775c44dd5e4352f679c7e46" + [[package]] name = "hayro-cmap" version = "0.1.0" @@ -2967,7 +2986,7 @@ name = "hayro-jbig2" version = "0.3.0" dependencies = [ "fearless_simd", - "hayro-ccitt", + "hayro-ccitt 0.3.0", ] [[package]] @@ -2988,7 +3007,7 @@ name = "hayro-syntax" version = "0.7.2" dependencies = [ "flate2", - "hayro-ccitt", + "hayro-ccitt 0.3.0", "hayro-jbig2", "hayro-jpeg2000", "memchr", @@ -3702,9 +3721,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" +checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c" [[package]] name = "lopdf" @@ -4101,6 +4120,7 @@ dependencies = [ "objc2-core-foundation", "objc2-core-graphics", "objc2-foundation 0.3.2", + "objc2-uniform-type-identifiers 0.3.2", ] [[package]] @@ -4319,7 +4339,7 @@ dependencies = [ "objc2-link-presentation", "objc2-quartz-core 0.2.2", "objc2-symbols", - "objc2-uniform-type-identifiers", + "objc2-uniform-type-identifiers 0.2.2", "objc2-user-notifications", ] @@ -4346,6 +4366,16 @@ dependencies = [ "objc2-foundation 0.2.2", ] +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7902ac02859fc1f7045f8b598c63f1ae0cc7efeaa06a9bc9f3d9a3c955974fa4" +dependencies = [ + "objc2 0.6.5", + "objc2-foundation 0.3.2", +] + [[package]] name = "objc2-user-notifications" version = "0.2.2" @@ -4361,14 +4391,14 @@ dependencies = [ [[package]] name = "ocrs" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4192a7dbc7570398ef97ab2606799703b6ea11da53f637d705d44546614435" +checksum = "1b9bb55cfe654ffee0f47641ae839dd4ba3117f47d5240378607af7cce2113fe" dependencies = [ - "anyhow", "rayon", "rten", "rten-imageproc", + "rten-sequence", "rten-tensor", "thiserror 2.0.21", "wasm-bindgen", @@ -4530,7 +4560,7 @@ dependencies = [ "pdfcraft-engine", "pdfcraft-platform", "pdfcraft-ui-egui", - "pollster 1.0.1", + "pollster", "raw-window-handle", "serde_json", "uds_windows", @@ -4652,7 +4682,7 @@ dependencies = [ "craft-jpeg", "craft-tiff", "encoding_rs", - "hayro-ccitt", + "hayro-ccitt 0.5.0", "hayro-syntax", "image", "pdfcraft-cos", @@ -4760,9 +4790,9 @@ dependencies = [ name = "pdfcraft-fonts" version = "0.21.1" dependencies = [ - "harfrust", + "harfrust 0.13.3", "pdfcraft-cos", - "skrifa 0.44.0", + "skrifa 0.47.0", "unicode-bidi", ] @@ -4912,7 +4942,7 @@ dependencies = [ "pdfcraft-cos", "pdfcraft-model", "pdfcraft-render", - "skrifa 0.44.0", + "skrifa 0.47.0", "thiserror 2.0.21", "winprint 0.2.1 (git+https://github.com/storytold/winprint.rs?rev=5f80b9baf6b58937c401656634e42d33f00ddf49)", ] @@ -4959,7 +4989,7 @@ dependencies = [ "pdfcraft-geom", "pdfcraft-testkit", "serde", - "skrifa 0.44.0", + "skrifa 0.47.0", "thiserror 2.0.21", "unicode-bidi", "url", @@ -5049,13 +5079,13 @@ dependencies = [ "pdfcraft-render", "pdfcraft-xfa", "plist", - "pollster 1.0.1", + "pollster", "proptest", "rfd", "rustix 1.1.6", "serde", "serde_json", - "skrifa 0.44.0", + "skrifa 0.47.0", "sys-locale", "tempfile", "toml", @@ -5393,12 +5423,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "pollster" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" - [[package]] name = "pollster" version = "1.0.1" @@ -5801,6 +5825,17 @@ dependencies = [ "once_cell", ] +[[package]] +name = "read-fonts" +version = "0.43.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "005c8acf251756c478b0bf402885bfd88a1476020c4c7e6060edc1aa68da38ea" +dependencies = [ + "bytemuck", + "font-types 0.12.5", + "once_cell", +] + [[package]] name = "read-fonts" version = "0.44.0" @@ -5952,9 +5987,9 @@ dependencies = [ [[package]] name = "rfd" -version = "0.17.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20dafead71c16a34e1ff357ddefc8afc11e7d51d6d2b9fbd07eaa48e3e540220" +checksum = "c4b9d4857b10297ffb0f64cae711e983a7aeaee561848d56d429d3858bd8ed93" dependencies = [ "block2 0.6.2", "dispatch2", @@ -5965,8 +6000,9 @@ dependencies = [ "objc2-app-kit 0.3.2", "objc2-core-foundation", "objc2-foundation 0.3.2", + "objc2-uniform-type-identifiers 0.3.2", "percent-encoding", - "pollster 0.4.0", + "pollster", "raw-window-handle", "wasm-bindgen", "wasm-bindgen-futures", @@ -6057,9 +6093,9 @@ dependencies = [ [[package]] name = "rten" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7741649977427aa13009537ac9a8fe1a503b0aa58784069ce8f117e47eb6ab" +checksum = "68a8eceaf794b6a9cc37c59ea921031a51f527edce05293f72e795641556ca2c" dependencies = [ "flatbuffers", "num_cpus", @@ -6081,15 +6117,15 @@ dependencies = [ [[package]] name = "rten-base" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413dc975c7a3d0e6da0b146cd0387e3d389cceab0fc48328bfa716c7f2ae1b1e" +checksum = "718b3ecab8cc677a15a978e7a232a35c48a108f09c1c02214c6980a5f2b3e851" [[package]] name = "rten-gemm" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8efc07c654d4b3f8d81e2efd8b13aea7475568395289e5bb35393411aa6a451e" +checksum = "9a5644634733c7e2568e3796085e69da9774fc461c0d6c06535bc5c10341dfb0" dependencies = [ "rayon", "rten-base", @@ -6100,18 +6136,18 @@ dependencies = [ [[package]] name = "rten-imageproc" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18726eae9614e23a400560eb3a5e3fdb06526914c31aadaf767f14afde7680dd" +checksum = "e2e56f4369df60d21e0de84f5828bbca487c651487e1a86517eb844c33d2105e" dependencies = [ "rten-tensor", ] [[package]] name = "rten-model-file" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ea9e630b377f9249ff3c290466fef282319f86d13d560964209104cd3af542" +checksum = "56a7f7a224e288208c7971a9a307c4ea29618431410eb78d52231ca6b68aba6e" dependencies = [ "flatbuffers", "rten-base", @@ -6119,25 +6155,35 @@ dependencies = [ [[package]] name = "rten-onnx" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96944374568990b8d1bbc5bae5957585866f9dd8256130460405730948bfd42e" +checksum = "2603fd142215bc58c099f02950cb836d463282a3b51ef9b83ce3d8ba86e0b801" [[package]] name = "rten-parallel" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba9075b130f81df7be82496ea3a9bbf20fe9e75f106a22b0ece8700850f8f664" +checksum = "fa535561ed1dc9e878aed0ff50280d588a4f91996873978c9f64532450386e08" dependencies = [ "rayon", "rten-base", ] [[package]] -name = "rten-shape-inference" -version = "0.26.0" +name = "rten-sequence" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89289c26b6a5248fccf4d67627596848a03ed31888e6ce4ba6f666c689258122" +checksum = "9cea4f0a53a2c927ba904bd4ddc490713f886512b5819d9f77f20126db30a99d" +dependencies = [ + "rten-base", + "rten-tensor", +] + +[[package]] +name = "rten-shape-inference" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47c5835450abda8a2d5a5c056ea323d8a49ee8cb069a500247ebf6ac467db84a" dependencies = [ "rten-tensor", "smallvec", @@ -6145,15 +6191,15 @@ dependencies = [ [[package]] name = "rten-simd" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f0c01294eb782adca256aa130b48a04006d03763073a68f45a9c33b982ea556" +checksum = "f844a9756ca67c6a2a808642caafd781d4ad2c4eb5d4b78e5c300b3cbb29167f" [[package]] name = "rten-tensor" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf72556ba231d7af50238d26dd264856a2149c6369694eb79b22644c8280c81b" +checksum = "2fcfdd96084216840a4be918add09f09b6a5c9532dbb8ce4ce70d99c783ab10d" dependencies = [ "rayon", "rten-base", @@ -6164,9 +6210,9 @@ dependencies = [ [[package]] name = "rten-vecmath" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1007f05160f9ea2ce4e9c67324e5bafb27ae1e5302d0c6b1ea4db0d35fed78ee" +checksum = "37594106d3db45458fabb6f62c2b23b8591b2d3dc733cf7b3aded16c1626d802" dependencies = [ "rten-base", "rten-simd", @@ -7179,7 +7225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.3", "once_cell", "rustix 1.1.6", "windows-sys 0.61.2", @@ -7612,9 +7658,9 @@ checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954" [[package]] name = "unicode-normalization" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" +checksum = "75cd3fb03d5288b3ba9a1ee103ac7e9cbb59f0b03d64f8ddfcc04dd42758a85d" dependencies = [ "tinyvec", ] @@ -8760,9 +8806,9 @@ dependencies = [ [[package]] name = "xattr" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" +checksum = "963d6fab92d5504b971dc8bd90ca743c2575e590bc8071ea5bc571598667ae08" dependencies = [ "libc", "rustix 1.1.6", @@ -8999,9 +9045,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" +checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 8bd2a5fb8c..43034b1c18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,7 +98,7 @@ weezl = "0.2" # CCITT Group 4 encoding (pdfcraft-filters); already in the tree through tiff. fax = "0.2.7" # Independent CCITT and JBIG2 codecs, already in the tree through hayro. -hayro-ccitt = "0.3" +hayro-ccitt = "0.5" hayro-jbig2 = "0.3" # foundation @@ -122,7 +122,7 @@ egui = "0.37" egui_extras = { version = "0.37", default-features = false, features = ["svg"] } eframe = { version = "0.37", default-features = false } egui_kittest = "0.37" -rfd = "0.17" +rfd = "0.18" # Monotonic time for logic-only work on native and web (`App::logic` runs without a UI pass). web-time = "1.1" diff --git a/crates/fonts/Cargo.toml b/crates/fonts/Cargo.toml index 9db852e7e7..780581e303 100644 --- a/crates/fonts/Cargo.toml +++ b/crates/fonts/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] pdfcraft-cos = { workspace = true } # Glyph outlines of the bundled script font (typed signatures); already in the tree via egui. -skrifa = "0.44" +skrifa = "0.47" # Arabic shaping for text written into PDFs; already in the tree via egui, on the same read-fonts. -harfrust = "0.12" +harfrust = "0.13" unicode-bidi = "0.3" diff --git a/crates/ocr/Cargo.toml b/crates/ocr/Cargo.toml index 882c0e92b7..1c0ca7d43b 100644 --- a/crates/ocr/Cargo.toml +++ b/crates/ocr/Cargo.toml @@ -12,9 +12,9 @@ workspace = true [dependencies] pdfcraft-fonts = { workspace = true } -ocrs = { version = "0.13.1", default-features = false, features = ["rten"] } -rten = { version = "0.26.0", default-features = false, features = ["onnx_format", "rten_format"] } -rten-imageproc = "0.26.0" +ocrs = { version = "0.14.0", default-features = false, features = ["rten"] } +rten = { version = "0.28.0", default-features = false, features = ["onnx_format", "rten_format"] } +rten-imageproc = "0.28.0" serde_json.workspace = true sha2 = "0.11" thiserror.workspace = true diff --git a/crates/print/Cargo.toml b/crates/print/Cargo.toml index bec4e283a7..e7d952de6c 100644 --- a/crates/print/Cargo.toml +++ b/crates/print/Cargo.toml @@ -23,4 +23,4 @@ winprint = { version = "0.2.1", git = "https://github.com/storytold/winprint.rs" [dev-dependencies] pdfcraft-render = { workspace = true } # Reads the renamed programs back with a parser that isn't ours. -skrifa = "0.44" +skrifa = "0.47" diff --git a/crates/render/Cargo.toml b/crates/render/Cargo.toml index a815802464..64ae278f35 100644 --- a/crates/render/Cargo.toml +++ b/crates/render/Cargo.toml @@ -16,7 +16,7 @@ pdfcraft-geom = { workspace = true } hayro ={ workspace = true } hayro-syntax = { workspace = true } # Picks the face of an installed font collection (the version pdfcraft-fonts already uses). -skrifa = "0.44" +skrifa = "0.47" lopdf = { workspace = true } kurbo = { workspace = true } thiserror = { workspace = true } diff --git a/crates/ui-egui/Cargo.toml b/crates/ui-egui/Cargo.toml index cca968360b..bb3233fc5c 100644 --- a/crates/ui-egui/Cargo.toml +++ b/crates/ui-egui/Cargo.toml @@ -52,7 +52,7 @@ base64 = "0.23" unicode-bidi = "0.3" # Checks that an installed fallback font parses and has the glyphs, and reads the vertical metrics # that put fallback faces on the interface's baseline (#1676); the same skrifa egui uses. -skrifa = "0.44" +skrifa = "0.47" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] craft-update = { workspace = true } @@ -103,7 +103,7 @@ egui_kittest = { workspace = true, features = ["eframe", "wgpu"] } egui = { workspace = true, features = ["default_fonts", "monochrome_emoji_fonts"] } image = { version = "0.25", default-features = false } # Glyph-coverage test of the interface fonts; the same skrifa pdfcraft-fonts already uses. -skrifa = "0.44" +skrifa = "0.47" proptest = { workspace = true } [build-dependencies]