From 1376a5476b06c3f14f8b048b0165eeeafdee29a0 Mon Sep 17 00:00:00 2001 From: Martin Ball Date: Mon, 2 Nov 2026 01:04:39 +0000 Subject: [PATCH] CP4.3: restack on #5205 9ffd30d; craft-proof at storytold/craft-libs#495 89fa1559 (contains #485), font store and catalog at #486 762a06a4 (store-lock race fix) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01FypgCX8LsYYE8fsj4byBm2 --- Cargo.lock | 8 ++++---- Cargo.toml | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7edae18ba..8eae304e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1014,7 +1014,7 @@ dependencies = [ [[package]] name = "craft-atomic" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=83c2e7bf8c6e409581b099a098eb00ac423d8b6c#83c2e7bf8c6e409581b099a098eb00ac423d8b6c" +source = "git+https://github.com/storytold/craft-libs?rev=762a06a4c6b48b522b7d4de84a87917ef90265e6#762a06a4c6b48b522b7d4de84a87917ef90265e6" dependencies = [ "rustix 1.1.5", ] @@ -1022,7 +1022,7 @@ dependencies = [ [[package]] name = "craft-font-catalog" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=83c2e7bf8c6e409581b099a098eb00ac423d8b6c#83c2e7bf8c6e409581b099a098eb00ac423d8b6c" +source = "git+https://github.com/storytold/craft-libs?rev=762a06a4c6b48b522b7d4de84a87917ef90265e6#762a06a4c6b48b522b7d4de84a87917ef90265e6" dependencies = [ "fontique", "skrifa 0.47.0", @@ -1033,7 +1033,7 @@ dependencies = [ [[package]] name = "craft-font-store" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=83c2e7bf8c6e409581b099a098eb00ac423d8b6c#83c2e7bf8c6e409581b099a098eb00ac423d8b6c" +source = "git+https://github.com/storytold/craft-libs?rev=762a06a4c6b48b522b7d4de84a87917ef90265e6#762a06a4c6b48b522b7d4de84a87917ef90265e6" dependencies = [ "craft-atomic", "craft-font-catalog", @@ -1103,7 +1103,7 @@ dependencies = [ [[package]] name = "craft-proof" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=8f16fe5a132054f057c57e2af424a81f5ace4203#8f16fe5a132054f057c57e2af424a81f5ace4203" +source = "git+https://github.com/storytold/craft-libs?rev=89fa1559e94378ecef85cd7e4681400f4df053e0#89fa1559e94378ecef85cd7e4681400f4df053e0" dependencies = [ "log", "miniz_oxide 0.9.1", diff --git a/Cargo.toml b/Cargo.toml index 1856beabc..7fce58702 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,12 +24,13 @@ wordcraft-pdf = { path = "crates/pdf" } # Proofing is craft-libs' craft-proof (it was crates/proof); its Language data is craft-i18n's # language-data/, embedded from CRAFT_I18N_DIR (craft-i18n.rev). The package keeps the # `wordcraft-proof` name here so `wordcraft_proof::` paths are unchanged. -# craft-proof with Language packs is the head of storytold/craft-libs#485 (CP4.2, stacked on #483 -# SCOWL English and #482); the font store's `language-pack` kind is #486 (CP4.1). GitHub serves PR -# heads from storytold/craft-libs, and merged with merge commits they stay in its main. -wordcraft-proof = { package = "craft-proof", git = "https://github.com/storytold/craft-libs", rev = "8f16fe5a132054f057c57e2af424a81f5ace4203", version = "=0.1.0" } -craft-font-store = { git = "https://github.com/storytold/craft-libs", rev = "83c2e7bf8c6e409581b099a098eb00ac423d8b6c", version = "=0.1.0" } -craft-font-catalog = { git = "https://github.com/storytold/craft-libs", rev = "83c2e7bf8c6e409581b099a098eb00ac423d8b6c", version = "=0.1.0" } +# craft-proof is the head of storytold/craft-libs#495 (review fixes), which contains #485 (CP4.2, +# Language packs, on #483 SCOWL English and #482); the font store's `language-pack` kind is #486 +# (CP4.1). GitHub serves PR heads from storytold/craft-libs, and merged with merge commits they +# stay in its main. +wordcraft-proof = { package = "craft-proof", git = "https://github.com/storytold/craft-libs", rev = "89fa1559e94378ecef85cd7e4681400f4df053e0", version = "=0.1.0" } +craft-font-store = { git = "https://github.com/storytold/craft-libs", rev = "762a06a4c6b48b522b7d4de84a87917ef90265e6", version = "=0.1.0" } +craft-font-catalog = { git = "https://github.com/storytold/craft-libs", rev = "762a06a4c6b48b522b7d4de84a87917ef90265e6", version = "=0.1.0" } wordcraft-engine = { path = "crates/engine" } wordcraft-mcp = { path = "crates/mcp" } wordcraft-zotero = { path = "crates/zotero" }