DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Docking: pin craft-libs to 4dc543cb4 (craft-libs#312, owner test round)
aiongg0fc055ee37cb
diff --git a/Cargo.lock b/Cargo.lockindex 7f1f5050c..cc0bf23e1 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -954,7 +954,7 @@ dependencies = [[[package]]name = "craft-atomic"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["rustix 1.1.5",]@@ -962,7 +962,7 @@ dependencies = [[[package]]name = "craft-cms"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["rayon",]@@ -970,12 +970,12 @@ dependencies = [[[package]]name = "craft-docpath"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"[[package]]name = "craft-pdf"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["bytemuck","hayro",@@ -988,7 +988,7 @@ dependencies = [[[package]]name = "craft-print"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["craft-winprint-gdi","miniz_oxide 0.8.9",@@ -1001,7 +1001,7 @@ dependencies = [[[package]]name = "craft-ui"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["egui","log",@@ -2458,7 +2458,7 @@ dependencies = [[[package]]name = "hayro"version = "0.7.1"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["bytemuck","hayro-interpret",@@ -2478,7 +2478,7 @@ checksum = "9f4d0e94ddd48749f06bbe4e5389fb9799a0c45bcaf00495042076ef05e3241a"[[package]]name = "hayro-cmap"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["brotli","hayro-postscript",@@ -2487,7 +2487,7 @@ dependencies = [[[package]]name = "hayro-interpret"version = "0.7.0"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["bitflags 2.13.2","hayro-cmap",@@ -2505,7 +2505,7 @@ dependencies = [[[package]]name = "hayro-jbig2"version = "0.3.0"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["fearless_simd","hayro-ccitt",@@ -2523,12 +2523,12 @@ dependencies = [[[package]]name = "hayro-postscript"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"[[package]]name = "hayro-syntax"version = "0.7.2"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["flate2","hayro-ccitt",@@ -3029,7 +3029,7 @@ dependencies = [[[package]]name = "krilla"version = "0.8.2"-source = "git+https://github.com/storytold/craft-libs?rev=8a503cfe79f0a4e7da2e167e01e71155668e0cee#8a503cfe79f0a4e7da2e167e01e71155668e0cee"+source = "git+https://github.com/storytold/craft-libs?rev=4dc543cb449cc232e4c3d58f78a05c1ab169db9e#4dc543cb449cc232e4c3d58f78a05c1ab169db9e"dependencies = ["base64 0.22.1","bumpalo",diff --git a/Cargo.toml b/Cargo.tomlindex 4c49704d6..5712b126c 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -12,7 +12,7 @@ repository = "https://github.com/storytold/designcraft"[workspace.dependencies]# Shared reader and writer; publish the immutable revision before this consumer.-craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee", version = "=0.1.0", default-features = false }+craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e", version = "=0.1.0", default-features = false }# internaldesigncraft-geom = { path = "crates/geom" }designcraft-color = { path = "crates/color" }@@ -75,18 +75,18 @@ zip = { version = "3", default-features = false, features = ["deflate"] }indd = { git = "https://github.com/storytold/indd-utils", branch = "main" }# Which paths stored in documents may be followed (craft-libs).-craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee" }+craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e" }# Atomic file replacement for saves and exports (craft-libs).-craft-atomic = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee" }+craft-atomic = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e" }# File › Print through the system print spooler (craft-libs).-craft-print = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee" }+craft-print = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e" }# ICC colour management: working spaces, transforms, black point compensation (craft-libs).-craft-cms = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee" }+craft-cms = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e" }# ui# Shared frontend components; keep this dependency above the engine boundary.-craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee", features = ["serde"] }+craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e", features = ["serde"] }egui = "0.36"egui_extras = { version = "0.36", default-features = false, features = ["svg"] }eframe = { version = "0.36", default-features = false }@@ -122,11 +122,11 @@ debug = 0# Opt-in cancelable macOS termination on the pinned winit 0.30 line.[patch.crates-io]-krilla = { git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee", version = "=0.8.2" }+krilla = { git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e", version = "=0.8.2" }winit = { git = "https://github.com/storytold/winit.git", rev = "3d51077fd1a966f84df9ef287839dc84fd5b4ca7" }-hayro = { git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee", version = "=0.7.1" }-hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee", version = "=0.7.0" }-hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee", version = "=0.7.2" }-hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee", version = "=0.3.0" }-hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee", version = "=0.1.0" }-hayro-postscript = { git = "https://github.com/storytold/craft-libs", rev = "8a503cfe79f0a4e7da2e167e01e71155668e0cee", version = "=0.1.0" }+hayro = { git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e", version = "=0.7.1" }+hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e", version = "=0.7.0" }+hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e", version = "=0.7.2" }+hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e", version = "=0.3.0" }+hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e", version = "=0.1.0" }+hayro-postscript = { git = "https://github.com/storytold/craft-libs", rev = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e", version = "=0.1.0" }diff --git a/docs/pdf-backend.md b/docs/pdf-backend.mdindex e42bdf493..5fb13aaf8 100644--- a/docs/pdf-backend.md+++ b/docs/pdf-backend.md@@ -1,7 +1,7 @@# Shared PDF backendDesignCraft pins `craft-pdf`, patched Krilla 0.8.2 and the six Hayro reader crates (with-`hayro-cmap` and `hayro-postscript`) to craft-libs revision `8a503cfe79f0a4e7da2e167e01e71155668e0cee`. `craft-ui`,+`hayro-cmap` and `hayro-postscript`) to craft-libs revision `4dc543cb449cc232e4c3d58f78a05c1ab169db9e`. `craft-ui`,`craft-print` and the other craft-libs crates are pinned to the same revision. The reader migration is reviewed on top of the separate writer change.## Writingdiff --git a/xtask/src/pdf_deps.rs b/xtask/src/pdf_deps.rsindex f9a5683df..cc967714c 100644--- a/xtask/src/pdf_deps.rs+++ b/xtask/src/pdf_deps.rs@@ -4,7 +4,7 @@ use std::process::Command;use serde_json::Value;-const REV: &str = "8a503cfe79f0a4e7da2e167e01e71155668e0cee";+const REV: &str = "4dc543cb449cc232e4c3d58f78a05c1ab169db9e";const PACKAGES: &[(&str, &str)] = &[("craft-pdf", "0.1.0"),("krilla", "0.8.2"),