DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Merge upstream main a7f3239cf (#1103, #1101) into next
aiongg2f017d0826b1
diff --cc Cargo.lockindex 2fd71fa3a,3f7119dc4..a98280ec3--- a/Cargo.lock+++ b/Cargo.lock@@@ -1032,6 -996,8 +1032,7 @@@ dependencies ="kurbo","log","quick-xml",- "regex",+ "same-file","serde","serde_json","tempfile",diff --cc Cargo.tomlindex 7327ea70c,8631e3aa6..7665ee5dd--- a/Cargo.toml+++ b/Cargo.toml@@@ -47,8 -48,8 +47,9 @@@ unicode-bidi-mirroring = "0.4unicode-segmentation = "1"caseless = "0.2"regex = { version = "1", default-features = false, features = ["std", "unicode", "perf"] }+fancy-regex = "0.19.2"tempfile = "3"+ same-file = "1.0.6"# text / rendering / formatsskrifa = "0.47"diff --cc crates/engine/Cargo.tomlindex 51faa5987,c0b37f4c3..8982ddfda--- a/crates/engine/Cargo.toml+++ b/crates/engine/Cargo.toml@@@ -34,9 -34,11 +34,12 @@@ caseless = { workspace = trueunicode-segmentation = { workspace = true }[target.'cfg(not(target_arch = "wasm32"))'.dependencies]+craft-atomic = { workspace = true }tempfile = { workspace = true }+ [target.'cfg(windows)'.dependencies]+ same-file = { workspace = true }+[dev-dependencies]designcraft-fonts = { workspace = true, features = ["testing"] }zip = { workspace = true }diff --cc packaging/windows/designcraft.wxsindex bf8852abc,2eba6880f..8b41094ce--- a/packaging/windows/designcraft.wxs+++ b/packaging/windows/designcraft.wxs@@@ -2,11 -2,11 +2,11 @@@<!--DesignCraft MSI (WiX Toolset v5: `dotnet tool install -g wix`). Built by package.ps1:- wix build designcraft.wxs -arch x64 -d Version=1.2.3 -d BinDir=... -d IconPath=... -o out.msi+ wix build designcraft.wxs installer-ui.wxs -arch x64 -d Version=1.2.3 -d BinDir=... -d IconPath=... -o out.msi- Per-machine install into Program Files, a Start Menu shortcut, `.pcraft` owned by DesignCraft,- and DesignCraft offered under "Open with" for PSD/PSB and the image formats it reads (without- taking over the user's default app for them).+ Per-machine install into Program Files, a Start Menu shortcut, `.designcraft` owned by+ DesignCraft, and DesignCraft offered under "Open with" for IDML (without taking over the user's+ default app for it).--><Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"><Package