Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Merge origin/main into data-merge

Brandon Thomas48dfbcfd1912
diff --cc crates/doc/src/lib.rs
index 23d08930e,455a8dcd3..c4b69e86d
--- a/crates/doc/src/lib.rs
+++ b/crates/doc/src/lib.rs
@@@ -13,7 -14,7 +14,8 @@@ pub mod arabic
pub mod arrow;
pub mod attrs;
pub mod build;
+ pub mod cjk;
+pub mod datamerge;
mod edit;
pub mod endnotes;
pub mod ids;
diff --cc crates/engine/src/cmd/file.rs
index 16b23efd0,6e572a98a..e40000095
--- a/crates/engine/src/cmd/file.rs
+++ b/crates/engine/src/cmd/file.rs
@@@ -162,9 -161,11 +164,12 @@@ fn file_open(s: &mut Session, p: &Value
}
let bytes = std::fs::read(path).map_err(|e| EngineError::Other(format!("{path}: {e}")))?;
let mut d = from_bytes(&bytes)?;
+ super::datamerge::resolve_sources_on_open(&mut d, Some(std::path::Path::new(path)));
- let i = s.add_document(DocState::new(d, Some(path.to_string())));
- Ok(json!({"index": i}))
+ let (fonts, faces, warnings) = load_document_fonts(&mut d, path);
+ let mut st = DocState::new(d, Some(path.to_string()));
+ st.fonts = fonts;
+ let i = s.add_document(st);
+ Ok(json!({"index": i, "documentFonts": faces, "warnings": warnings}))
}
#[cfg(target_arch = "wasm32")]
{
diff --cc crates/engine/src/cmd/mod.rs
index 3d16e47ef,6a5147c06..68061af0a
--- a/crates/engine/src/cmd/mod.rs
+++ b/crates/engine/src/cmd/mod.rs
@@@ -297,6 -297,6 +297,7 @@@ pub fn file_bytes(d: &designcraft_doc::
pub fn file_from(b: &[u8]) -> Result<designcraft_doc::Document> {
file::from_bytes(b)
}
+pub(crate) use datamerge::sync_placeholders;
+ pub(crate) use file::load_document_fonts;
pub use file::{base64_decode, base64_encode, from_bytes, to_bytes};
pub(crate) use place_text::autoflow as place_text_autoflow;
diff --cc crates/engine/src/lib.rs
index b55131a02,6d39b0158..771c89b13
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@@ -91,10 -91,20 +91,24 @@@ pub struct DocState
/// Editing parent spreads (Pages panel double-click on a parent).
pub editing_parents: bool,
pub uid: u64,
+ /// Unfilled document while data-merge preview is showing a record. Not saved.
+ pub preview_stash: Option<Arc<Document>>,
+ /// 1-based record currently previewed.
+ pub preview_record: Option<u32>,
+ /// The fonts the document brought (`doc.font_scope`), found while it is open.
+ pub fonts: Option<Arc<FontScope>>,
+ }
+
+ /// A document's font scope ([`designcraft_fonts::FontDb::load_document_fonts`]): its fonts are
+ /// found until the document's state (with every copy of it) is gone — closed, reverted, or its
+ /// session ended.
+ #[derive(Debug)]
+ pub struct FontScope(pub u32);
+
+ impl Drop for FontScope {
+ fn drop(&mut self) {
+ designcraft_fonts::FontDb::global().close_scope(self.0);
+ }
}
static NEXT_UID: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
@@@ -115,8 -125,7 +129,9 @@@ impl DocState
interaction: None,
editing_parents: false,
uid: NEXT_UID.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
+ preview_stash: None,
+ preview_record: None,
+ fonts: None,
}
}
pub fn is_dirty(&self) -> bool {