diff --git a/crates/engine/src/cmd/style/object.rs b/crates/engine/src/cmd/style/object.rs index 7fcc3d1f3..fb2467e5f 100644 --- a/crates/engine/src/cmd/style/object.rs +++ b/crates/engine/src/cmd/style/object.rs @@ -159,6 +159,37 @@ pub(super) fn create_object(s: &mut Session, p: &Value) -> Result { }) } +/// `paragraphStyle`: a paragraph style's name, or null (the object style sets none). +fn paragraph_style_param(cmd: &str, s: &Session, p: &Value) -> Result>> { + match p.get("paragraphStyle") { + None => Ok(None), + Some(Value::Null) => Ok(Some(None)), + Some(Value::String(n)) if s.doc()?.doc.styles.para(n).is_some() => Ok(Some(Some(n.clone()))), + Some(Value::String(n)) => Err(bad(cmd, format!("no paragraph style `{n}`"))), + Some(_) => Err(bad(cmd, "`paragraphStyle` must be a paragraph style's name or null")), + } +} + +/// `textFrame` (a text frame's options, as `document.inspect` shows them) merged over `base`, or +/// null; refused when the columns aren't 1–40 or a gutter, width or inset isn't 0–15552 pt. +fn text_frame_param( + cmd: &str, + p: &Value, + base: Option<&designcraft_doc::TextFrameOptions>, +) -> Result>> { + let tf = group_param(cmd, p, "textFrame", base.unwrap_or(&designcraft_doc::TextFrameOptions::default()))?; + if let Some(Some(o)) = &tf { + if !(1..=40).contains(&o.columns) { + return Err(bad(cmd, "text frame columns must be 1–40")); + } + let mut lengths = [o.gutter, o.column_width, o.vj_paragraph_spacing_limit, o.first_baseline_min].into_iter().chain(o.inset); + if !lengths.all(|v| v.is_finite() && (0.0..=15552.0).contains(&v)) { + return Err(bad(cmd, "a text frame's gutter, widths and insets must be 0–15552 pt")); + } + } + Ok(tf) +} + /// A true/false parameter, when given. fn bool_param(cmd: &str, p: &Value, key: &str) -> Result> { match p.get(key) { diff --git a/crates/ui-egui/src/panel_docking.rs b/crates/ui-egui/src/panel_docking.rs index 801a96ae3..709eb0d02 100644 --- a/crates/ui-egui/src/panel_docking.rs +++ b/crates/ui-egui/src/panel_docking.rs @@ -114,7 +114,7 @@ impl Placed { const ICON_GROUPS: &[&[&str]] = &[ &["stroke", "color", "swatches", "gradient"], &["effects"], - &["characterStyles", "paragraphStyles"], + &["characterStyles", "paragraphStyles", "objectStyles"], &["character", "paragraph", "typography"], &["glyphs", "story"], &["table"], diff --git a/crates/ui-egui/src/panel_docking/tests.rs b/crates/ui-egui/src/panel_docking/tests.rs index 77b721098..a4e7f97ef 100644 --- a/crates/ui-egui/src/panel_docking/tests.rs +++ b/crates/ui-egui/src/panel_docking/tests.rs @@ -881,7 +881,7 @@ fn placed_panels_leave_their_icon_groups() { let column = icon_column(None, &mut placed).unwrap(); let groups: Vec> = column.groups.iter().map(|g| g.panels.iter().map(String::as_str).collect()).collect(); assert_eq!(groups.first().unwrap(), &["stroke", "color", "gradient"]); - assert_eq!(groups.get(1).unwrap(), &["characterStyles", "paragraphStyles"]); + assert_eq!(groups.get(1).unwrap(), &["characterStyles", "paragraphStyles", "objectStyles"]); assert_eq!(groups.len(), ICON_GROUPS.len() - 1); }