Merge PR #553 from NikitkaRa: Text: Bullets and Numbering dialog

# Conflicts:
#	crates/engine/src/tests.rs

crates/engine/src/cmd/format.rs

@@ -135,7 +135,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Numbering",
             ["Home", "Paragraph"],
             None,
-            "{on?: bool, scheme?: arabicPeriod|arabicParenR|romanUcPeriod|romanLcPeriod|alphaUcPeriod|alphaLcParenR|alphaLcPeriod, start?: n}",
+            "{on?: bool, scheme?: arabicPeriod|arabicParenR|romanUcPeriod|romanLcPeriod|alphaUcPeriod|alphaLcParenR|alphaLcPeriod, start?: n, color?, size?: % of text}",
             has_text_or_shapes,
             numbering
         ),
@@ -527,7 +527,7 @@ fn bullets(s: &mut Session, p: &Value) -> Result<Value> {
     let on = on_param(p, Some(cur));
     let ch = str_param(p, "char").unwrap_or("•").to_string();
     let col = color_param(p, "color");
-    let size = f64_param(p, "size").map(|v| v / 100.0);
+    let size = f64_param(p, "size").map(|v| (v / 100.0).clamp(0.25, 4.0));
     let explicit_char = p.get("char").is_some();
     format_para(s, &move |para| {
         if on {
@@ -556,9 +556,17 @@ fn numbering(s: &mut Session, p: &Value) -> Result<Value> {
     let on = on_param(p, Some(cur));
     let scheme = str_param(p, "scheme").unwrap_or("arabicPeriod").to_string();
     let start = p.get("start").and_then(Value::as_u64).map(|v| v.clamp(1, 32767) as u32).unwrap_or(1);
+    let col = color_param(p, "color");
+    let size = f64_param(p, "size").map(|v| (v / 100.0).clamp(0.25, 4.0));
     format_para(s, &move |para| {
         if on {
             para.props.bullet = Some(Bullet::AutoNum { scheme: scheme.clone(), start_at: start });
+            if col.is_some() {
+                para.props.bullet_color = col.clone();
+            }
+            if size.is_some() {
+                para.props.bullet_size = size;
+            }
             para.props.margin_left = Some(27.0 + 36.0 * para.level as f64);
             para.props.indent = Some(-27.0);
         } else {

crates/engine/src/tests.rs

@@ -1546,3 +1546,23 @@ fn motion_path_presets_have_paths_ids_and_round_trip() {
     assert_eq!((b.effect.as_str(), b.class), ("heart", AnimClass::Path));
     assert!(b.path.as_deref().is_some_and(|p| p.contains('L')));
 }
+
+/// Bullets and Numbering dialog: numbering takes a colour and a size like bullets do, and sizes
+/// stay within PowerPoint's 25–400 %.
+#[test]
+fn numbering_takes_color_and_size() {
+    let mut s = Session::with_new();
+    s.execute("insert.textBox", &json!({"rect": [10, 10, 300, 100], "text": "One\nTwo"})).unwrap();
+    s.execute("format.numbering", &json!({"on": true, "scheme": "romanUcPeriod", "start": 3, "color": "accent2", "size": 150})).unwrap();
+    let para = |s: &Session| {
+        let st = s.doc().unwrap();
+        let id = st.selection.shapes[0];
+        st.shape(id).unwrap().text.as_ref().unwrap().paragraphs[0].props.clone()
+    };
+    let pp = para(&s);
+    assert!(matches!(&pp.bullet, Some(deckcraft_model::text::Bullet::AutoNum { scheme, start_at: 3 }) if scheme == "romanUcPeriod"));
+    assert_eq!(pp.bullet_size, Some(1.5));
+    assert_eq!(pp.bullet_color, Some(deckcraft_model::ColorRef::scheme(deckcraft_color::SchemeSlot::Accent2)));
+    s.execute("format.bullets", &json!({"on": true, "char": "★", "size": 9000})).unwrap();
+    assert_eq!(para(&s).bullet_size, Some(4.0));
+}