DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Merge branch 'print-color' into print-color-separations
aionggd90881a8a992
diff --cc Cargo.lockindex 44df7430c,64c46b0e8..d1c29b3b8--- a/Cargo.lock+++ b/Cargo.lock@@@ -981,16 -1023,6 +1023,16 @@@ dependencies ="thiserror 2.0.21",]+[[package]]+name = "craft-prepress"+version = "0.1.0"- source = "git+https://github.com/storytold/craft-libs?rev=e3b9e239c52c14677be462e94d8920ea243de4f3#e3b9e239c52c14677be462e94d8920ea243de4f3"++source = "git+https://github.com/storytold/craft-libs?rev=495e5971bc024aa96e6ed318cb6e7cd3a0103184#495e5971bc024aa96e6ed318cb6e7cd3a0103184"+dependencies = [+ "craft-cms",+ "craft-pdf",+ "thiserror 2.0.21",+]+[[package]]name = "craft-print"version = "0.1.0"@@@ -1458,8 -1520,8 +1532,9 @@@ dependencies =name = "designcraft-ui-egui"version = "0.13.0"dependencies = [+ "craft-prepress","craft-ui",+ "craft-update","craft-window","designcraft-color","designcraft-compose",@@@ -3396,9 -3469,15 +3482,15 @@@ version = "0.50.3source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.59.0",]+ [[package]]+ name = "num-conv"+ version = "0.2.2"+ source = "registry+https://github.com/rust-lang/crates.io-index"+ checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"+[[package]]name = "num-traits"version = "0.2.19"diff --cc Cargo.tomlindex a4e448294,d15253721..64ddfe5d0--- a/Cargo.toml+++ b/Cargo.toml@@@ -128,16 -129,14 +129,16 @@@ debug =# Opt-in cancelable macOS termination on the pinned winit 0.30 line.[patch.crates-io]- krilla = { git = "https://github.com/storytold/craft-libs", rev = "e3b9e239c52c14677be462e94d8920ea243de4f3", version = "=0.8.2" }+ krilla = { git = "https://github.com/storytold/craft-libs", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184", version = "=0.8.2" }winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" }+# The hayro crates from craft-libs' vendor/ directory (pdfcraft's, plus the plate mode and decode+# limits craft-pdf and craft-prepress need); same revision as craft-pdf.- hayro = { git = "https://github.com/storytold/craft-libs", rev = "e3b9e239c52c14677be462e94d8920ea243de4f3", version = "=0.7.1" }- hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "e3b9e239c52c14677be462e94d8920ea243de4f3", version = "=0.7.0" }- hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "e3b9e239c52c14677be462e94d8920ea243de4f3", version = "=0.7.2" }- hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "e3b9e239c52c14677be462e94d8920ea243de4f3", version = "=0.3.0" }- hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "e3b9e239c52c14677be462e94d8920ea243de4f3", version = "=0.1.0" }- hayro-postscript = { git = "https://github.com/storytold/craft-libs", rev = "e3b9e239c52c14677be462e94d8920ea243de4f3", version = "=0.1.0" }+ hayro = { git = "https://github.com/storytold/craft-libs", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184", version = "=0.7.1" }+ hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184", version = "=0.7.0" }+ hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184", version = "=0.7.2" }+ hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184", version = "=0.3.0" }+ hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184", version = "=0.1.0" }+ hayro-postscript = { git = "https://github.com/storytold/craft-libs", rev = "495e5971bc024aa96e6ed318cb6e7cd3a0103184", version = "=0.1.0" }ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }