Graph Type: widths past 100%, First Row and First Column in Front, Draw Filled Lines

Graph Type's column, bar and cluster widths from 1% to 1000%, overlapping
past 100%, the overlap order, and Draw Filled Lines, as
https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/visualize-data/format-columns-bars-and-lines.html
describes.

- Column and cluster widths take 1–1000% and are drawn as set: past
  100% columns (or clusters) overlap. The legend moves past columns
  that reach beyond the plot.
- firstColumnInFront draws the first series over the others (in each
  layer); firstRowInFront draws each series' first category over the
  next. Across series the series order decides, so each series stays
  one group for Group Selection.
- filledLines draws the connecting lines of line, scatter and radar
  graphs as 3 pt bands filled with the series colour (set as a fill or,
  on a thin line, a stroke) with a thin black outline. A run with no
  outline to make, or a graph past 20,000 data points, keeps thin lines.
- The Graph Type query lists the overlap options only for graphs with
  columns or bars, and filled lines only for graphs with lines.

Own choices, as the page doesn't say: both overlap options start off
(today's order), and the band is 3 pt wide. New fields are written only
when set. Graphs with default options draw the same art as before.

crates/doc/src/graph.rs

@@ -265,9 +265,9 @@ pub struct GraphSpec {
     /// in a version that doesn't know blanks. Cells past the end of a short row are blank too.
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub blanks: Vec<[usize; 2]>,
-    /// Column/bar width as a % of the available category width (90).
+    /// Column/bar width as a % of the available category width (90); past 100 the columns overlap.
     pub column_width: f64,
-    /// Cluster width as a % (80).
+    /// Cluster width as a % (80); past 100 the clusters overlap.
     pub cluster_width: f64,
     /// Legend on the right (Graph Type options: Add Legend Across Top = false).
     pub legend: bool,
@@ -293,6 +293,14 @@ pub struct GraphSpec {
     pub right_axis_min: Option<f64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub right_axis_max: Option<f64>,
+    /// Graph Type › First Row in Front (each series' first category drawn over the next when columns overlap) and
+    /// First Column in Front (the first series drawn over the others); Draw Filled Lines (lines as filled bands).
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub first_row_in_front: bool,
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub first_column_in_front: bool,
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub filled_lines: bool,
     /// Graph Type › Add Drop Shadow (behind columns, bars, lines and pie wedges) and Add Legend Across Top (the
     /// legend in rows above the plot instead of a column on its right).
     #[serde(skip_serializing_if = "std::ops::Not::not")]
@@ -414,6 +422,9 @@ impl Default for GraphSpec {
             right_axis_min: None,
             right_axis_max: None,
             series_markers: vec![],
+            first_row_in_front: false,
+            first_column_in_front: false,
+            filled_lines: false,
             drop_shadow: false,
             legend_across_top: false,
             pie_legend_in_wedges: false,

crates/engine/src/cmd/graph.rs

@@ -43,7 +43,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Type…",
             ["Object", "Graph"],
             None,
-            "{id?, type?, seriesIndexes?: [index], columnWidth?: %, clusterWidth?: %, legend?: bool, markPoints?: bool, connectPoints?: bool, edgeToEdge?: bool (line graphs: true runs the lines across the whole plot, false puts the points at the centres of their categories), ticks?: n, axisMin?, axisMax?, valueAxis?: left|right|both (the bar graphs' value axis stays along the bottom), separateScales?: bool, rightTicks?: n, rightAxisMin?, rightAxisMax?, tickLength?: none|short|full, tickMarks?: n per division, rightTickLength?, rightTickMarks?, categoryTickLength?: none|short|full, categoryTickMarks?: n, ticksBetweenLabels?: bool, prefix?, suffix?, rightPrefix?, rightSuffix?: text around the value axis numbers, dropShadow?: bool (Add Drop Shadow: a translucent black shadow down and right of the columns, bars, lines and pie wedges), legendAcrossTop?: bool (Add Legend Across Top: the legend in rows above the plot), pieLegend?: none|standard|wedges (Legends in Wedges: the series labels inside their wedges), piePosition?: ratio|even|stacked (several pies sized by their totals, at one size (the default), or stacked), pieSort?: all|first|none (wedges largest first in each pie, in the first pie's order, or in data order (the default)); the query lists the pie options for pie graphs} change the graph type and options; with `seriesIndexes`, or (no `id`) with only series selected with Group Selection, `type` goes to those series only and `valueAxis` (left|right; both is refused) puts them on that value axis, while the other options still apply to the whole graph (Combine different graph types: column, stacked column, line and area mix, and so do bar and stacked bar; a series given the graph's type follows the graph again) (axisMin and axisMax together override the calculated value axis: exactly that range in `ticks` divisions, 5 when 0; with the value axis on both sides, separateScales gives the series on the right axis a scale of their own, set the same way with rightTicks, rightAxisMin and rightAxisMax); no options → the current ones",
+            "{id?, type?, seriesIndexes?: [index], columnWidth?: % (1–1000; past 100 columns overlap), clusterWidth?: % (1–1000), legend?: bool, markPoints?: bool, connectPoints?: bool, edgeToEdge?: bool (line graphs: true runs the lines across the whole plot, false puts the points at the centres of their categories), ticks?: n, axisMin?, axisMax?, valueAxis?: left|right|both (the bar graphs' value axis stays along the bottom), separateScales?: bool, rightTicks?: n, rightAxisMin?, rightAxisMax?, tickLength?: none|short|full, tickMarks?: n per division, rightTickLength?, rightTickMarks?, categoryTickLength?: none|short|full, categoryTickMarks?: n, ticksBetweenLabels?: bool, prefix?, suffix?, rightPrefix?, rightSuffix?: text around the value axis numbers, firstRowInFront?: bool, firstColumnInFront?: bool (which overlapping columns are drawn on top: the first category over the next within each series, the first series over the others), filledLines?: bool (Draw Filled Lines: connecting lines as 3 pt bands filled with the series colour), dropShadow?: bool (Add Drop Shadow: a translucent black shadow down and right of the columns, bars, lines and pie wedges), legendAcrossTop?: bool (Add Legend Across Top: the legend in rows above the plot), pieLegend?: none|standard|wedges (Legends in Wedges: the series labels inside their wedges), piePosition?: ratio|even|stacked (several pies sized by their totals, at one size (the default), or stacked), pieSort?: all|first|none (wedges largest first in each pie, in the first pie's order, or in data order (the default)); the query lists the pie options for pie graphs} change the graph type and options; with `seriesIndexes`, or (no `id`) with only series selected with Group Selection, `type` goes to those series only and `valueAxis` (left|right; both is refused) puts them on that value axis, while the other options still apply to the whole graph (Combine different graph types: column, stacked column, line and area mix, and so do bar and stacked bar; a series given the graph's type follows the graph again) (axisMin and axisMax together override the calculated value axis: exactly that range in `ticks` divisions, 5 when 0; with the value axis on both sides, separateScales gives the series on the right axis a scale of their own, set the same way with rightTicks, rightAxisMin and rightAxisMax); no options → the current ones",
             has_selection,
             set_type
         ),
@@ -323,6 +323,24 @@ impl Gen<'_> {
         g.name = Some(name.into());
         Arc::new(g)
     }
+    /// A series' line joining its data points (Connect Data Points): a 1 pt stroke in the series colour, or with Draw
+    /// Filled Lines a band FILLED_LINE_WIDTH wide filled with it and outlined in black.
+    fn data_line(&mut self, g: &GraphSpec, s: usize, pd: PathData, filled: bool) -> Arc<Node> {
+        let band = if filled {
+            vectorcraft_pathops::outline_stroke(&pd, FILLED_LINE_WIDTH, vectorcraft_pathops::Cap::Butt, vectorcraft_pathops::Join::Miter, 4.0)
+        } else {
+            PathData::default()
+        };
+        // A run the outline can't be made for (its points all in one place) stays a thin line.
+        if !band.is_empty() {
+            // The band takes the series' colour, set as a fill or, on a thin line, as its stroke; a thin black outline.
+            let slot = g.series_paints.get(s);
+            let fill = slot.and_then(|p| p.fill.clone().or_else(|| p.stroke.clone())).unwrap_or_else(|| default_series_paint(s));
+            return self.path(band, fill, Paint::solid(Color::BLACK), 0.25);
+        }
+        let (fill, stroke, w) = series_marks(g, s, false, default_series_paint(s), 1.0);
+        self.path(pd, fill, stroke, w)
+    }
     /// A data point's marker filling `cell`: the series' marker design, else the default square in the series' paint.
     fn marker(&mut self, design: Option<&Arc<Node>>, cell: Rect, (fill, stroke, w): (Paint, Paint, f64)) -> Arc<Node> {
         match design.and_then(|a| fit_design(self.d, a, cell)) {
@@ -343,6 +361,9 @@ impl Gen<'_> {
 /// Add Drop Shadow: how far the shadow sits down and right of its mark, and how dark it is.
 const SHADOW_OFFSET: f64 = 2.0;
 const SHADOW_OPACITY: f32 = 0.35;
+/// Draw Filled Lines: how wide a filled line is.
+const FILLED_LINE_WIDTH: f64 = 3.0;
+const FILLED_LINE_BUDGET: usize = 20_000;
 /// Most marks a graph draws shadows for (each is a copy).
 const SHADOW_BUDGET: usize = 200_000;
 
@@ -468,6 +489,10 @@ fn generate(d: &mut Document, g: &GraphSpec) -> Vec<Arc<Node>> {
     // Labels drawn over the series: a pie's Legends in Wedges (in the Legend group) and stacked pies' names.
     let mut wedge_labels = vec![];
     let mut on_top = vec![];
+    // Draw Filled Lines, up to FILLED_LINE_BUDGET data points (the outlines are rebuilt on every change).
+    let filled = g.filled_lines && g.rows.len().saturating_mul(nser) <= FILLED_LINE_BUDGET;
+    // Where columns and bars reach (past the plot when their widths are over 100%), so the legend keeps clear.
+    let mut bars_reach: Option<Rect> = None;
     // Add Drop Shadow: the columns, bars, lines and wedges to cast one.
     let mut shadowed: Vec<(usize, Arc<Node>)> = vec![];
     match g.kind {
@@ -600,8 +625,7 @@ fn generate(d: &mut Document, g: &GraphSpec) -> Vec<Arc<Node>> {
             for (s, items) in series.iter_mut().enumerate() {
                 let pts: Vec<Point> = (0..ncat).map(|c| at(c, val(c, s))).collect();
                 if g.connect_points && pts.len() > 1 {
-                    let (fill, stroke, w) = mark(s, false, default_series_paint(s), 1.0);
-                    let n = b.path(polyline(&pts, true), fill, stroke, w);
+                    let n = b.data_line(g, s, polyline(&pts, true), filled);
                     shadowed.push((s, n.clone()));
                     items.push(n);
                 }
@@ -842,8 +866,7 @@ fn generate(d: &mut Document, g: &GraphSpec) -> Vec<Arc<Node>> {
                         .collect();
                     if g.connect_points {
                         for run in runs(&pts) {
-                            let (fill, stroke, w) = mark(si, false, default_series_paint(si), 1.0);
-                            let n = b.path(polyline(&run, false), fill, stroke, w);
+                            let n = b.data_line(g, si, polyline(&run, false), filled);
                             shadowed.push((si, n.clone()));
                             series[si].push(n);
                         }
@@ -867,19 +890,24 @@ fn generate(d: &mut Document, g: &GraphSpec) -> Vec<Arc<Node>> {
             let stack_axes: Vec<usize> = (0..2).filter(|a| stacks.iter().any(|s| axis(*s) == *a)).collect();
             let own_width = columns.is_empty() && stack_axes.len() < 2;
             let slots = columns.len() + stack_axes.len();
-            let cluster = cat_w * (g.cluster_width / 100.0).clamp(0.01, 1.0);
+            // Widths past 100% make the columns (or clusters) overlap.
+            let cluster = cat_w * (g.cluster_width / 100.0).clamp(0.01, 10.0);
             let slot = cluster / slots.max(1) as f64;
-            let bar = slot * (g.column_width / 100.0).clamp(0.01, 1.0);
+            let bar = slot * (g.column_width / 100.0).clamp(0.01, 10.0);
             let bar_rect = |a: f64, w: f64, v0: f64, v1: f64| {
                 if horizontal { Rect::new(v0.min(v1), a, v0.max(v1), a + w) } else { Rect::new(a, v0.min(v1), a + w, v0.max(v1)) }
             };
-            for c in 0..ncat {
+            // First Row in Front: the first category drawn last, over the next.
+            let cats: Vec<usize> = if g.first_row_in_front { (0..ncat).rev().collect() } else { (0..ncat).collect() };
+            for c in cats {
                 let c0 = cat_start(c) + (cat_w - cluster) / 2.0;
                 for (i, &s) in columns.iter().enumerate() {
                     let Some(v) = cell(c, s) else { continue };
                     let a = c0 + slot * i as f64 + (slot - bar) / 2.0;
                     let (fill, stroke, w) = mark(s, true, Paint::None, 0.0);
-                    let n = b.path(shapes::rectangle(bar_rect(a, bar, zero(axis(s)), vpos(axis(s), v))), fill, stroke, w);
+                    let rect = bar_rect(a, bar, zero(axis(s)), vpos(axis(s), v));
+                    bars_reach = Some(bars_reach.map_or(rect, |r| r.union(rect)));
+                    let n = b.path(shapes::rectangle(rect), fill, stroke, w);
                     shadowed.push((s, n.clone()));
                     if let Some(items) = series.get_mut(s) {
                         items.push(n);
@@ -887,7 +915,9 @@ fn generate(d: &mut Document, g: &GraphSpec) -> Vec<Arc<Node>> {
                 }
                 let place = |ax: usize| {
                     if own_width {
-                        let w = (cat_w * (g.column_width / 100.0).clamp(0.01, 1.0) * (g.cluster_width / 100.0).clamp(0.01, 1.0) * 1.2).min(cat_w);
+                        // Up to the category's width, or past it when the widths are set past 100%.
+                        let (col, clus) = ((g.column_width / 100.0).clamp(0.01, 10.0), (g.cluster_width / 100.0).clamp(0.01, 10.0));
+                        let w = (cat_w * col * clus * 1.2).min(cat_w * (col * clus).max(1.0));
                         (cat_start(c) + (cat_w - w) / 2.0, w)
                     } else {
                         let i = columns.len() + stack_axes.iter().position(|a| *a == ax).unwrap_or(0);
@@ -904,7 +934,9 @@ fn generate(d: &mut Document, g: &GraphSpec) -> Vec<Arc<Node>> {
                     let (v0, v1) = (vpos(ax, *base), vpos(ax, *base + v));
                     *base += v;
                     let (fill, stroke, sw) = mark(s, true, Paint::solid(Color::WHITE), 0.25);
-                    let n = b.path(shapes::rectangle(bar_rect(a, w, v0, v1)), fill, stroke, sw);
+                    let rect = bar_rect(a, w, v0, v1);
+                    bars_reach = Some(bars_reach.map_or(rect, |r| r.union(rect)));
+                    let n = b.path(shapes::rectangle(rect), fill, stroke, sw);
                     // A segment of 0 has no area to shade.
                     if v != 0.0 {
                         shadowed.push((s, n.clone()));
@@ -936,8 +968,7 @@ fn generate(d: &mut Document, g: &GraphSpec) -> Vec<Arc<Node>> {
                     (0..ncat).map(|c| cell(c, s).map(|v| Point::new(mid(c, g.edge_to_edge && label_edges), vpos(axis(s), v)))).collect();
                 if g.connect_points {
                     for run in runs(&pts) {
-                        let (fill, stroke, w) = mark(s, false, default_series_paint(s), 1.0);
-                        let n = b.path(polyline(&run, false), fill, stroke, w);
+                        let n = b.data_line(g, s, polyline(&run, false), filled);
                         shadowed.push((s, n.clone()));
                         if let Some(items) = series.get_mut(s) {
                             items.push(n);
@@ -984,6 +1015,7 @@ fn generate(d: &mut Document, g: &GraphSpec) -> Vec<Arc<Node>> {
         let height = |row: &[(usize, String, f64)]| LABEL_SIZE * 1.8 * row.iter().map(|(_, l, _)| l.split('|').count()).max().unwrap_or(1) as f64;
         // Above the plot and anything drawn over it (radar and stacked-pie labels).
         let top = b.out.iter().chain(on_top.iter()).filter_map(|n| n.geometric_bounds()).map(|bb| bb.y0).fold(r.y0, f64::min);
+        let top = bars_reach.map_or(top, |b| top.min(b.y0));
         let mut y = top - 8.0 - rows.iter().map(|row| height(row)).sum::<f64>();
         for row in &rows {
             let mut x = r.x0;
@@ -1000,7 +1032,7 @@ fn generate(d: &mut Document, g: &GraphSpec) -> Vec<Arc<Node>> {
             y += height(row);
         }
     } else if legend_on {
-        let x = right_edge + 14.0;
+        let x = bars_reach.map_or(right_edge, |b| right_edge.max(b.x1)) + 14.0;
         // Each row as tall as its label's lines (a `|` in a label starts a new line).
         let mut y = r.y0;
         for (s, items) in series.iter_mut().enumerate().take(legend_series) {
@@ -1032,6 +1064,10 @@ fn generate(d: &mut Document, g: &GraphSpec) -> Vec<Arc<Node>> {
         shadowed.clear();
     }
     let mut series: Vec<(usize, Vec<Arc<Node>>)> = series.into_iter().enumerate().collect();
+    // First Column in Front: the first series drawn last in its layer, over the others.
+    if g.first_column_in_front {
+        series.reverse();
+    }
     series.sort_by_key(|(s, _)| depth(*s));
     let mut layer = None;
     for (s, items) in series {
@@ -1570,6 +1606,9 @@ fn set_type(s: &mut Session, p: &Value) -> Result<Value> {
         "rightSuffix",
         "dropShadow",
         "legendAcrossTop",
+        "firstRowInFront",
+        "firstColumnInFront",
+        "filledLines",
         "pieLegend",
         "piePosition",
         "pieSort",
@@ -1595,7 +1634,20 @@ fn set_type(s: &mut Session, p: &Value) -> Result<Value> {
             "categoryTickMarks": spec.category_tick_marks.clamp(1, MAX_TICK_MARKS), "ticksBetweenLabels": spec.ticks_between_labels,
             "prefix": one_line(&spec.prefix), "suffix": one_line(&spec.suffix), "rightPrefix": one_line(&spec.right_prefix),
             "rightSuffix": one_line(&spec.right_suffix), "dropShadow": spec.drop_shadow, "legendAcrossTop": spec.legend_across_top,
+            "firstRowInFront": spec.first_row_in_front, "firstColumnInFront": spec.first_column_in_front, "filledLines": spec.filled_lines,
         });
+        // Only the options this graph's types use: overlap order for columns and bars, filled lines for lines.
+        let kinds: Vec<GraphKind> = (0..count.max(1)).map(|i| spec.series_kind(i)).collect();
+        let has = |ks: &[GraphKind]| kinds.iter().any(|k| ks.contains(k));
+        if let Some(o) = fields.as_object_mut() {
+            if !has(&[GraphKind::Column, GraphKind::StackedColumn, GraphKind::Bar, GraphKind::StackedBar]) {
+                o.remove("firstRowInFront");
+                o.remove("firstColumnInFront");
+            }
+            if !has(&[GraphKind::Line, GraphKind::Scatter, GraphKind::Radar]) {
+                o.remove("filledLines");
+            }
+        }
         // Pie graphs: Legend, Position and Sort (their Legend stands for the legend checkbox).
         if let Some(o) = fields.as_object_mut().filter(|_| spec.kind == GraphKind::Pie) {
             o.remove("legend");
@@ -1690,9 +1742,12 @@ fn set_type(s: &mut Session, p: &Value) -> Result<Value> {
         spec.right_axis_max = v.as_f64();
     }
     spec.column_width = f64_or(p, "columnWidth", spec.column_width).clamp(1.0, 1000.0);
-    spec.cluster_width = f64_or(p, "clusterWidth", spec.cluster_width).clamp(1.0, 100.0);
+    spec.cluster_width = f64_or(p, "clusterWidth", spec.cluster_width).clamp(1.0, 1000.0);
     spec.legend = bool_or(p, "legend", spec.legend);
     spec.drop_shadow = bool_or(p, "dropShadow", spec.drop_shadow);
+    spec.first_row_in_front = bool_or(p, "firstRowInFront", spec.first_row_in_front);
+    spec.first_column_in_front = bool_or(p, "firstColumnInFront", spec.first_column_in_front);
+    spec.filled_lines = bool_or(p, "filledLines", spec.filled_lines);
     spec.legend_across_top = bool_or(p, "legendAcrossTop", spec.legend_across_top);
     // After `legend`, which the Graph Type dialog sends too.
     if let Some(v) = str_param(p, "pieLegend") {
@@ -3486,4 +3541,106 @@ mod tests {
         let last_row = texts.iter().map(|b| b.y0).fold(f64::MIN, f64::max);
         assert!(texts.iter().filter(|b| b.y0 < last_row - 1e-6).all(|b| b.x1 <= 400.0 + 1e-6), "{texts:?}");
     }
+
+    #[test]
+    fn widths_past_100_overlap_and_the_first_row_or_column_goes_in_front() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();
+        let id = graph(&mut s, "column");
+        s.execute("graph.setType", &json!({"columnWidth": 250, "clusterWidth": 300})).unwrap();
+        let g = spec(&s, id);
+        assert_eq!((g.column_width, g.cluster_width), (250.0, 300.0));
+        let (a, b) = (marks(&s, id, 0), marks(&s, id, 1));
+        assert!(a[0].x1 > b[0].x0, "the columns of a cluster overlap: {:?} {:?}", a[0], b[0]);
+        assert!(b[0].x1 > a[1].x0, "and so do the clusters: {:?} {:?}", b[0], a[1]);
+        assert_eq!(s.execute("graph.setType", &json!({"clusterWidth": 5000})).map(|_| spec(&s, id).cluster_width).unwrap(), 1000.0);
+        let order =
+            |s: &Session| -> Vec<u32> { s.doc().unwrap().doc.node(id).unwrap().children().unwrap().iter().filter_map(|c| c.series_index).collect() };
+        assert_eq!(order(&s), [0, 1]);
+        s.execute("graph.setType", &json!({"firstColumnInFront": true})).unwrap();
+        assert_eq!(order(&s), [1, 0], "the first series drawn last, on top");
+        // First Row in Front: each series' first category drawn last.
+        let xs = |s: &Session| marks(s, id, 0).iter().map(|b| b.x0).collect::<Vec<_>>();
+        let before = xs(&s);
+        assert!(before.windows(2).all(|w| w[0] < w[1]));
+        s.execute("graph.setType", &json!({"firstRowInFront": true})).unwrap();
+        let after = xs(&s);
+        assert!(after.windows(2).all(|w| w[0] > w[1]), "{after:?}");
+        let v = s.execute("graph.setType", &json!({})).unwrap();
+        assert_eq!((v["firstRowInFront"].clone(), v["firstColumnInFront"].clone()), (json!(true), json!(true)));
+    }
+
+    #[test]
+    fn filled_lines_are_bands_in_the_series_colour() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();
+        let id = make(&mut s, "line", ",a\nQ1,2\nQ2,2\nQ3,2");
+        let thin = marks(&s, id, 0)[0];
+        assert!(thin.height() < 1e-6, "a flat 1 pt line");
+        s.execute("graph.setType", &json!({"filledLines": true})).unwrap();
+        let parts = series_parts(&s, id, 0);
+        let band = parts[0].geometric_bounds().unwrap();
+        assert!((band.height() - 3.0).abs() < 1e-6 && (band.width() - thin.width()).abs() < 1e-6, "{band:?}");
+        assert_eq!(parts[0].appearance.fill_paint().color().unwrap().to_hex(), "#000000", "the first series' colour");
+        assert_eq!(parts[0].appearance.stroke_width(), 0.25);
+        // A series colour set with Group Selection fills the band.
+        let grp = series(s.doc().unwrap().doc.node(id).unwrap(), 0).id;
+        s.execute("paint.setFill", &json!({"ids": [grp.0], "color": "#ff0000"})).unwrap();
+        s.execute("graph.setData", &json!({"id": id.0, "rows": [[2], [3], [2]]})).unwrap();
+        assert_eq!(series_parts(&s, id, 0)[0].appearance.fill_paint().color().unwrap().to_hex(), "#ff0000");
+        let path = vectorcraft_testkit::temp_dir("graph-filled").join("filled.vectorcraft");
+        s.execute("graph.setType", &json!({"firstRowInFront": true, "firstColumnInFront": true})).unwrap();
+        s.execute("document.save", &json!({"path": path})).unwrap();
+        s.execute("document.open", &json!({"path": path})).unwrap();
+        let g = spec(&s, id);
+        assert!(g.filled_lines && g.first_row_in_front && g.first_column_in_front);
+        let v = serde_json::to_value(GraphSpec::default()).unwrap();
+        for k in ["filledLines", "firstRowInFront", "firstColumnInFront"] {
+            assert!(v.get(k).is_none(), "{k}");
+        }
+    }
+
+    #[test]
+    fn filled_lines_keep_the_line_colour_and_fall_back_to_thin_lines() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();
+        let id = make(&mut s, "line", ",a\nQ1,2\nQ2,3\nQ3,2");
+        // A colour given to the thin line (its stroke) fills the band.
+        let grp = series(s.doc().unwrap().doc.node(id).unwrap(), 0).id;
+        s.execute("paint.setStroke", &json!({"ids": [grp.0], "color": "#00ff00"})).unwrap();
+        s.execute("graph.setType", &json!({"id": id.0, "filledLines": true})).unwrap();
+        let band = &series_parts(&s, id, 0)[0];
+        assert_eq!(band.appearance.fill_paint().color().unwrap().to_hex(), "#00ff00");
+        // A radar series of zeros has every point at the centre: no band to make, so a thin line.
+        let radar = make(&mut s, "radar", ",a\nQ1,0\nQ2,0\nQ3,0");
+        s.execute("graph.setType", &json!({"id": radar.0, "filledLines": true})).unwrap();
+        let line = &series_parts(&s, radar, 0)[0];
+        assert!(line.appearance.fill_paint().is_none(), "a stroked line");
+        // Past the budget, thin lines.
+        let rows: Vec<Vec<f64>> = (0..8_000).map(|i| vec![(i % 7) as f64, 1.0, 2.0]).collect();
+        let big = NodeId(
+            s.execute("graph.create", &json!({"type": "line", "x": 0, "y": 0, "width": 300, "height": 200, "rows": rows})).unwrap()["id"]
+                .as_u64()
+                .unwrap(),
+        );
+        s.execute("graph.setType", &json!({"id": big.0, "filledLines": true, "markPoints": false})).unwrap();
+        assert!(series_parts(&s, big, 0)[0].appearance.fill_paint().is_none());
+    }
+
+    #[test]
+    fn overlapping_columns_keep_clear_of_the_legend_and_options_follow_the_graph_type() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();
+        let id = graph(&mut s, "column");
+        s.execute("graph.setType", &json!({"columnWidth": 1000, "clusterWidth": 1000})).unwrap();
+        let reach = (0..2).flat_map(|i| marks(&s, id, i)).map(|b| b.x1).fold(f64::MIN, f64::max);
+        assert!(reach > 400.0, "past the plot: {reach}");
+        let swatch = series_parts(&s, id, 0).last().unwrap().geometric_bounds().unwrap();
+        assert!(swatch.x0 >= reach + 14.0 - 1e-6, "{swatch:?} after {reach}");
+        let v = s.execute("graph.setType", &json!({})).unwrap();
+        assert!(v.get("firstRowInFront").is_some() && v.get("filledLines").is_none());
+        let line = graph(&mut s, "line");
+        let v = s.execute("graph.setType", &json!({"id": line.0})).unwrap();
+        assert!(v.get("firstRowInFront").is_none() && v.get("filledLines").is_some());
+    }
 }

docs/roadmap.md

@@ -59,7 +59,7 @@ Checked 2026-10-10 from the code, tests and open issues; no workflow fails, so V
 | M9 | Live effects (+ 3D & Materials) | 🟡 2D effects done incl. Effect → Pathfinder, Color Adjustments and Document Raster Effects Settings; PDF export warns when the pixel cap lowers raster-effect resolution; initial Revolve only; SVG Filters, remaining raster effects and 3D pending | 81–130 |
 | M10 | Brushes, symbols, patterns, Repeat | 🟡 pattern swatches (5 tile types, Pattern Options, editing mode, SVG `<pattern>`/PDF export) and live Repeat (radial/grid/mirror) done; brushes/symbols in progress | 23–37 |
 | M11 | Artboards & views (artboard panel/tool with Move Artwork for X/Y fields and Artboard Options, Trim View, middle-button pan, print tiling and the status bar's artboard navigator done; multiple windows, presentation polish) | 🟡 | 15–25 |
-| M12 | Advanced color & art (CMYK/ICC, separations, Gradient Mesh, Live Paint, Image Trace, Graphs) | 🟡 Gradient Mesh, Live Paint, Image Trace (13 presets, 18 ms/1k² image; the Flat Logo mode places edges to a fraction of a pixel, restores sharp corners, snaps lines and circles, and refuses gradients), Recolor Artwork, colour management (ICC, soft proofing, separations preview), Graphs (all 9 tools, Graph Data/Type, group-selected series colours persist through regenerate/save/open) done; Graph Design and Marker designs, Transpose and Switch x/y, `|` label line breaks, the pie options, drop shadows and the legend across the top done; graph Column designs, Import Data and the data sheet's cell style pending | 6–10 |
+| M12 | Advanced color & art (CMYK/ICC, separations, Gradient Mesh, Live Paint, Image Trace, Graphs) | 🟡 Gradient Mesh, Live Paint, Image Trace (13 presets, 18 ms/1k² image; the Flat Logo mode places edges to a fraction of a pixel, restores sharp corners, snaps lines and circles, and refuses gradients), Recolor Artwork, colour management (ICC, soft proofing, separations preview), Graphs (all 9 tools, Graph Data/Type, group-selected series colours persist through regenerate/save/open) done; Graph Design and Marker designs, Transpose and Switch x/y, `|` label line breaks, the pie options, drop shadows, the legend across the top, overlapping widths, First Row/Column in Front and filled lines done; graph Column designs, Import Data and the data sheet's cell style pending | 6–10 |
 | M13 | Automation (Actions ✅ record/playback, persisted; variables, scripting, batch) | 🟡 | 18–27 |
 | M14 | 1.0 polish (preferences, shortcut editor, workspaces, accessibility, packaging for all OSes) | 🟡 Preferences, shortcut editor (chords with Shift and a punctuation key fire as typed), workspaces, a custom title bar on Windows/Linux with a Home button, content-sized dialogs, menus that scroll when longer than the window and macOS native menu dismissal done (M14.8), and native macOS save sheets with a Format menu (#866); an experimental, unsupported Windows 7 x64 portable OpenGL build (not verified by maintainers); accessibility and broader Windows/Linux packaging/QA pending | 18–28 |
 | — | Interaction fidelity pass (every tool's modifiers, Properties panel per context, isolation, nuance) | ⬜ | 60–90 |
@@ -79,6 +79,7 @@ After placed documents (File › Place of a `.vectorcraft` file, linked), M4.14
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-11 | minor | M12: Graph Type's widths past 100%, First Row/Column in Front, Draw Filled Lines. Scores/hours unchanged. |
 | 2026-10-11 | minor | M12: Graph Type's Add Drop Shadow and Add Legend Across Top. Scores/hours unchanged. |
 | 2026-10-11 | minor | M12: Graph Data's Transpose and Switch x/y, `|` line breaks in graph labels, pie Legend/Position/Sort. Scores/hours unchanged. |
 | 2026-10-11 | minor | M12: Object › Graph › Design… and Marker… (graph designs, marker designs); column designs remain. Scores/hours unchanged. |

docs/target-app-parity.md

@@ -414,7 +414,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - **Live Corners:** drag a live rectangle's corner widgets (Selection or Direct Selection) to round all corners, with a radius readout; with Direct Selection, select corner anchors to show and round just those corners (#381). Each corner keeps its own radius and kind (Round, Inverted Round, Chamfer): Alt-click a widget to cycle the kind, double-click it for the Corners dialog, and the Properties and Transform radius fields set the selected corners (`object.setLiveShape {corners, radius, kind}`). Corners stay circular when the rectangle is scaled unevenly or along its own sides when rotated (the radius keeps its size, or scales by the mean scale with Scale Corners on); only a shear distorts them. On a rectangle that isn't square every corner is the same circle: a radius past half the shorter side stops there for all of them, the widgets sit on the corners as drawn and turn the edited corners red at that limit, CSS export writes the drawn radii, and rectangles saved stretched by older versions get circular corners when their corners are next set (#442). Live Corners work on any path's corners too, as on a rectangle's (#511): a star's, a live polygon's (which also shows them to the Selection tool, has a Corner Radius field in the Properties and Transform panels and keeps its radius as its sides change) and a pen path's, wherever two sides meet at an angle at an anchor that isn't smooth: curved sides too, trimmed to what the cut leaves of them (#1144). Direct Selection shows the widgets of every corner, or of the corners holding selected anchors; each corner is a circle tangent to both sides, drawn no larger than takes its cut halfway along its shorter side; a path keeps its uncut outline so its corners stay editable, and the same command, dialog, angle preference and View › Hide Corner Widget apply.
   - **Pen:** Alt pressed in the middle of dragging out an anchor splits its handles and keeps the curve already shaped into it (only the outgoing handle follows the pointer); Space held while dragging out an anchor moves it, handles and all. A press on the first anchor of the path being drawn closes it whatever the drag then does: the drag shapes the closing curve (symmetric handles, Alt breaks them) and the release closes the path wherever it ends (#501). Clicking the last anchor of the path being drawn retracts its outgoing handle (convert cursor), and dragging from it pulls out a new one on its own. Auto Add/Delete: over a selected path, a click on a segment adds an anchor and a click on an anchor deletes it (add and delete cursors); Shift held, or Preferences › General › Disable Auto Add/Delete, starts a new path instead. Alt held over a handle end or an anchor of a selected path (the one being drawn too) works as the Anchor Point tool, with its convert cursor: dragging a handle moves it alone, clicking a smooth anchor makes it a corner, dragging an anchor pulls out new symmetric handles, dragging a segment reshapes it; drawing then goes on. Cmd (Ctrl) held drags with the selection tool chosen last, Direct Selection until one is (handles, anchors and segments of the path being drawn or another), and the Pen then goes on drawing its path while that stays selected; the pointer shows that tool's while Cmd is held. The same holds for agents (`pointer_gesture` with `mods.cmd`), as the borrowing now lives in the engine (#494).
   - **Path editing (#494):** the handles shown are the handles that drag: Direct Selection drags those of a path selected as a whole (as the Pen leaves it), the Anchor Point tool and Pen+Alt no longer grab handles that Show handles when multiple anchors are selected hides, a handle shorter than the tolerance leaves its anchor to be picked, and the anchor tools pick within Selection & Anchor Display › Tolerance. A dragged segment keeps a smooth anchor at either end smooth. With Direct Selection, the Pen, the Curvature and the anchor tools, a path selected as a whole shows all its anchors selected, and the Control bar and the Properties panel offer Convert (corner, smooth) for them too; Remove and Cut wait for anchors direct-selected (#504). A handle drag gathers its snap targets once per drag (it took 21 ms per pointer move on a 20,000-path document, now 1 ms; `vectorcraft-cli perf` measures handle and segment drags on a 5,000-anchor path).
-  - **Graphs:** Column, Stacked Column, Bar, Stacked Bar, Line, Area, Scatter, Pie and Radar graph tools with Graph Data and Graph Type. A series starts in greyscale; Group Selection's fill and stroke are kept separately on the graph and reapplied when its data, type or size changes, and through save, open and undo. Graph Type's Override Calculated Values (both `axisMin` and `axisMax`) uses exactly that value-axis range, split into the tick count (5 when automatic). Line graphs take Edge-to-Edge Lines (off by default: the points sit at the centres of their categories; graphs saved before the option keep their edge-to-edge lines), and radar graphs follow Mark Data Points and Connect Data Points. Blank cells (an empty CSV cell or `null`) are values left out, not zeros: columns, bars and stacked segments skip them, lines and scatter lines break around them and the value axis ignores them, while area, pie and radar draw them as 0; a number in straight quotes is a label, and the data window writes it back quoted. Graph types combine: Graph Type on series picked with Group Selection (or `series` indexes) draws them as their own type, with column, stacked column, line and area mixing on the vertical value axis and bar and stacked bar on the horizontal one; stacked columns take one slot of the cluster, lines draw in front of columns and areas behind. The value axis goes on the left, the right or both sides (column, stacked column, line, area and scatter graphs; bar graphs keep theirs along the bottom), and Separate Scales gives the series assigned to the right axis a scale of their own with its own tick values. Each value axis takes tick marks of no, short or full (across the plot) length and a count per division, and a prefix and suffix for its numbers; the category axis takes tick marks too (none by default), at or between its labels. Graph designs: Object › Graph › Design lists the designs with a preview of the selected one, and New Design (the selected art), Rename, Delete Design, Paste Design (a copy back to edit) and Select Unused, and Marker draws the data points and legend swatches of line, scatter and radar series with a design, scaled so its backmost object fills the default marker's square. Graph Data transposes rows and columns and switches a scatter graph's x and y, and a `|` in a category or series label starts a new line. Pie graphs take Legends in Wedges, Position (Even, Ratio sized by area, Stacked on one centre) and Sort (None, All, First). Graph Type adds drop shadows behind columns, bars, lines and wedges, and puts the legend in rows across the top. Column designs, Import Data and the Graph Data sheet's cell style remain open.
+  - **Graphs:** Column, Stacked Column, Bar, Stacked Bar, Line, Area, Scatter, Pie and Radar graph tools with Graph Data and Graph Type. A series starts in greyscale; Group Selection's fill and stroke are kept separately on the graph and reapplied when its data, type or size changes, and through save, open and undo. Graph Type's Override Calculated Values (both `axisMin` and `axisMax`) uses exactly that value-axis range, split into the tick count (5 when automatic). Line graphs take Edge-to-Edge Lines (off by default: the points sit at the centres of their categories; graphs saved before the option keep their edge-to-edge lines), and radar graphs follow Mark Data Points and Connect Data Points. Blank cells (an empty CSV cell or `null`) are values left out, not zeros: columns, bars and stacked segments skip them, lines and scatter lines break around them and the value axis ignores them, while area, pie and radar draw them as 0; a number in straight quotes is a label, and the data window writes it back quoted. Graph types combine: Graph Type on series picked with Group Selection (or `series` indexes) draws them as their own type, with column, stacked column, line and area mixing on the vertical value axis and bar and stacked bar on the horizontal one; stacked columns take one slot of the cluster, lines draw in front of columns and areas behind. The value axis goes on the left, the right or both sides (column, stacked column, line, area and scatter graphs; bar graphs keep theirs along the bottom), and Separate Scales gives the series assigned to the right axis a scale of their own with its own tick values. Each value axis takes tick marks of no, short or full (across the plot) length and a count per division, and a prefix and suffix for its numbers; the category axis takes tick marks too (none by default), at or between its labels. Graph designs: Object › Graph › Design lists the designs with a preview of the selected one, and New Design (the selected art), Rename, Delete Design, Paste Design (a copy back to edit) and Select Unused, and Marker draws the data points and legend swatches of line, scatter and radar series with a design, scaled so its backmost object fills the default marker's square. Graph Data transposes rows and columns and switches a scatter graph's x and y, and a `|` in a category or series label starts a new line. Pie graphs take Legends in Wedges, Position (Even, Ratio sized by area, Stacked on one centre) and Sort (None, All, First). Graph Type takes column and cluster widths up to 1000% (overlapping past 100%) with First Row and First Column in Front (First Row orders each series' categories; across series the series order decides, so series stay one group each for Group Selection), draws filled lines, adds drop shadows behind columns, bars, lines and wedges, and puts the legend in rows across the top. Column designs, Import Data and the Graph Data sheet's cell style remain open.
   - **Other:** Eyedropper, Gradient annotator, Artboard (Alt-drag duplicates an artboard, and its art with Move/Copy Artwork with Artboard on; Copy, Cut and Paste take the artboard with its art, Paste right of the last artboard, Paste in Place where it was, into this or another document, #446; Object › Artboards › Rearrange All Artboards lays them out in a grid by row or by column, in one row or one column, left to right or right to left, from the menu, the Artboards panel or Properties' Rearrange All, #681; Scale Artwork with Artboard, in the Control bar and Properties beside Move Artwork with Artboard, resizes the artboard proportionally with the art fully inside it and its guides, strokes and corners per the Scale preferences, #602), Measure, Type, Hand, Zoom, Rotate View.
   - **Editing type:** double-clicking type with a selection tool switches to the Type tool with the caret where it was clicked.
   - **Temporary tools:** Cmd with any other tool drags with the selection tool used last (Selection, Direct Selection or Group Selection). Held Space pans and Cmd+Space zooms (Cmd+Alt+Space out) whatever the tool.
@@ -467,6 +467,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-11 | minor | Graph Type's widths past 100%, First Row/Column in Front and Draw Filled Lines. Scores unchanged within rounding |
 | 2026-10-11 | minor | Graph Type's Add Drop Shadow and Add Legend Across Top. Scores unchanged within rounding |
 | 2026-10-11 | minor | Graph Data's Transpose and Switch x/y, `|` line breaks in graph labels, and the pie graph options (Legends in Wedges, Position, Sort). Scores unchanged within rounding |
 | 2026-10-11 | minor | Graph designs and marker designs (Object › Graph › Design… and Marker…): menu stubs 27 → 25; the graphs row's missing items are column designs and Image Trace depth. Scores unchanged within rounding |