DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Merge #606: Styles: selection capture accepts deleted-swatch fills
aiongga680f2c93726
diff --cc crates/engine/src/cmd/style.rsindex c4c4e5ed9,e60d2a1d7..b4749fb52--- a/crates/engine/src/cmd/style.rs+++ b/crates/engine/src/cmd/style.rs@@@ -435,23 -425,12 +435,25 @@@ fn apply_char(s: &mut Session, p: &Valu})}+/// In a style, `startAt: null` is Continue from Previous Number: it is stored as an explicit+/// "continue" so it also overrides a Start At the style would inherit.+fn continue_numbering(p: Option<&Value>, para: &mut ParaAttrs) {+ let explicit =+ p.and_then(Value::as_object).is_some_and(|o| o.iter().any(|(k, v)| v.is_null() && k.replace('_', "").eq_ignore_ascii_case("startAt")));+ if explicit {+ para.start_at = Some(None);+ }+}+fn create_para(s: &mut Session, p: &Value) -> Result<Value> {let base = str_param(p, "name").unwrap_or("Paragraph Style 1").to_string();- let mut para: ParaAttrs = attrs(p.get("para"), |a: &mut ParaAttrs, k, v| a.set_json(k, v))?;+ let mut para: ParaAttrs = attrs(p.get("para"), |a: &mut ParaAttrs, k, v| a.set_json_over(k, v, &designcraft_doc::ParaProps::default()))?;+ continue_numbering(p.get("para"), &mut para);+ explicit_default_kinsoku(&mut para, p.get("para"));+ check_grep_styles("style.paragraph.create", ¶)?;let mut chars: CharAttrs = attrs(p.get("chars"), |a: &mut CharAttrs, k, v| a.set_json(k, v))?;+ // Validate caller-supplied fills, not selection fills retained after a swatch is deleted.+ super::text::validate_char_fill(&s.doc()?.doc, &chars, "style.paragraph.create")?;if p.get("fromSelection").and_then(Value::as_bool).unwrap_or(false)&& let Ok(cur) = s.execute("type.selectionAttrs", &json!({}))&& !cur.is_null()