From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 25 Jul 2026 15:18:36 +0000 (-0700)
Subject: implement opacity and improve fitting to frames
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b563bc5fdbb35993907b4cc76e248646083dd69;p=pspp

implement opacity and improve fitting to frames
---

diff --git a/rust/pspp/src/spv/read/graph.rs b/rust/pspp/src/spv/read/graph.rs
index dabe3ab6c9..8d5b29f4dc 100644
--- a/rust/pspp/src/spv/read/graph.rs
+++ b/rust/pspp/src/spv/read/graph.rs
@@ -565,34 +565,6 @@ impl Visualization {
         let styles = self.decode_styles();
         let frames = self.decode_frames();
 
-        /*
-        for frame in &frames.frames {
-            if let Some(left) = frame.position[Axis2::X].start()
-                && let Some(width) = frame.position[Axis2::X].length()
-                && let Some(top) = frame.position[Axis2::Y].start()
-                && let Some(height) = frame.position[Axis2::Y].length()
-            {
-                document.append(
-                    Rectangle::new()
-                        .set("x", left)
-                        .set("y", top)
-                        .set("width", width)
-                        .set("height", height)
-                        .set("fill", "none")
-                        .set("stroke", "black")
-                        .add(Title::new(frame.id.as_deref().unwrap_or(""))),
-                );
-                println!(
-                    "{:?}: {}..{}, {}..{}",
-                    frame.id,
-                    left,
-                    frame.position[Axis2::X].end().unwrap(),
-                    top,
-                    frame.position[Axis2::Y].end().unwrap()
-                );
-            }
-        }*/
-
         let mut document = svg::Document::new()
             .set("xmlns:c", "http://www.example.org/")
             .set("style", "font-family: \"Sans Serif\"");
@@ -601,11 +573,16 @@ impl Visualization {
             && let Some(top) = frames.frames[0].position[Axis2::Y].start()
             && let Some(height) = frames.frames[0].position[Axis2::Y].length()
         {
-            document.assign("viewBox", (left, top, left + width + 75.0, top + height));
+            document.assign("viewBox", (left, top, left + width, top + height));
             document.assign("width", width);
             document.assign("height", height);
         }
 
+        let outline_frames = false;
+        if outline_frames {
+            document.append(frames.to_svg());
+        }
+
         let font_metrics = FontMetrics::new();
         for frame in &frames.frames {
             if let Some(label_frame) = frame.frame_type.as_label_frame()
@@ -688,8 +665,7 @@ impl Visualization {
         //dbg!(&axis_domains);
 
         let font_metrics = FontMetrics::new();
-        let font_height = font_metrics.measure("0")[Axis2::Y];
-        let mut rect = graph_frame.rect().unwrap();
+        let rect = graph_frame.rect().unwrap();
 
         let cell_style = graph
             .cell_style
@@ -698,23 +674,6 @@ impl Visualization {
             .cloned()
             .unwrap_or_default();
 
-        let y_axis = axis_domains[Axis3::Y].ticks();
-        let y_axis_text_width = y_axis
-            .iter()
-            .map(|(_y, label)| OrderedFloat(font_metrics.measure(label)[Axis2::X]))
-            .max()
-            .map(|OrderedFloat(f)| f)
-            .unwrap_or_default();
-        rect.0[Axis2::X].0 += 10.0 + y_axis_text_width;
-        if axis_domains[Axis3::Y].label.is_some() {
-            rect.0[Axis2::X].0 += font_height;
-        }
-
-        rect.0[Axis2::Y].1 -= font_height + 10.0;
-        if axis_domains[Axis3::X].label.is_some() {
-            rect.0[Axis2::Y].1 -= font_height;
-        }
-
         let facet_levels = graph.facet_levels();
         let faceting = graph
             .faceting()
@@ -804,11 +763,7 @@ impl Visualization {
                             .set("fill", cell_style.fill(&mut patterns))
                             .set(
                                 "stroke",
-                                cell_style
-                                    .color2
-                                    .unwrap_or(Color::BLACK)
-                                    .display_css()
-                                    .to_string(),
+                                cell_style.color2(Color::BLACK).display_css().to_string(),
                             ),
                     );
                 }
@@ -938,8 +893,8 @@ impl Visualization {
                             style.color2 = Some(PALETTE[index % PALETTE.len()]);
                         }
 
-                        let color = style.color.unwrap_or(Color::BLACK);
-                        let color2 = style.color2.unwrap_or(Color::BLACK);
+                        let color = style.color(Color::BLACK);
+                        let color2 = style.color2(Color::BLACK);
                         let pattern = style.fill(&mut patterns);
 
                         fn points(
@@ -1682,7 +1637,6 @@ impl<'a> AxisDomain<'a> {
         }
     }
     fn ticks(&self) -> Vec<(f64, String)> {
-        dbg!(&self.domain);
         let mut ticks = Vec::new();
         match &self.domain {
             Domain::Interval {
@@ -1727,7 +1681,7 @@ impl<'a> AxisDomain<'a> {
             }
             _ => (),
         };
-        dbg!(ticks)
+        ticks
     }
 }
 
@@ -5068,7 +5022,7 @@ impl<'a> FacetHeadings<'a> {
             let ticks_height = ticks
                 .iter()
                 .map(|(_, s)| {
-                    font_metrics.measure(s)[if rotate_ticks { Axis2::Y } else { Axis2::Y }]
+                    font_metrics.measure(s)[if rotate_ticks { Axis2::X } else { Axis2::Y }]
                 })
                 .max_by(|a, b| a.total_cmp(b))
                 .unwrap_or_default();
@@ -5133,6 +5087,14 @@ impl<'a> FacetHeadings<'a> {
                 for (frac, label) in ticks {
                     let x = facet_span.frac(*frac);
                     let label = if label.is_empty() { "x" } else { &label };
+                    /*group.append(
+                        Circle::new()
+                            .set("cx", x)
+                            .set("cy", y)
+                            .set("r", "5px")
+                            .set("fill", "none")
+                            .set("stroke", "red"),
+                    );*/
                     if rotation == 0.0 {
                         group.append(
                             svg::node::element::Text::new(label)
@@ -5147,7 +5109,7 @@ impl<'a> FacetHeadings<'a> {
                                 .set("x", x)
                                 .set("y", y)
                                 .set("dominant-baseline", "middle")
-                                .set("text-anchor", "right")
+                                .set("text-anchor", "end")
                                 .set("transform", format!("rotate(90 {x} {y})")),
                         );
                     }
@@ -5266,7 +5228,7 @@ impl<'a> FacetHeadings<'a> {
                 &mut group,
                 &span,
                 if rotation != 0.0 {
-                    y + (*height - 20.0)
+                    y + (*height - 10.0)
                 } else {
                     y
                 },
diff --git a/rust/pspp/src/spv/read/graph/frames.rs b/rust/pspp/src/spv/read/graph/frames.rs
index 9bfdad3a51..0f47ef5682 100644
--- a/rust/pspp/src/spv/read/graph/frames.rs
+++ b/rust/pspp/src/spv/read/graph/frames.rs
@@ -2,6 +2,10 @@ use std::{fmt::Debug, ops::Range};
 
 use enum_iterator::all;
 use enum_map::{Enum, EnumMap, enum_map};
+use svg::{
+    Node as _,
+    node::element::{Group, Rectangle, Title},
+};
 
 use crate::{
     output::pivot::Axis2,
@@ -383,6 +387,30 @@ impl<'a> Frames<'a> {
                 _ => None,
             })
     }
+
+    pub fn to_svg(&self) -> Group {
+        let mut group = Group::new();
+        for frame in &self.frames {
+            if let Some(left) = frame.position[Axis2::X].start()
+                && let Some(width) = frame.position[Axis2::X].length()
+                && let Some(top) = frame.position[Axis2::Y].start()
+                && let Some(height) = frame.position[Axis2::Y].length()
+            {
+                let mut rectangle = Rectangle::new()
+                    .set("x", left)
+                    .set("y", top)
+                    .set("width", width)
+                    .set("height", height)
+                    .set("fill", "none")
+                    .set("stroke", "red");
+                if let Some(id) = &frame.id {
+                    rectangle.append(Title::new(id));
+                }
+                group.append(rectangle);
+            }
+        }
+        group
+    }
 }
 
 /// Position.
diff --git a/rust/pspp/src/spv/read/graph/style.rs b/rust/pspp/src/spv/read/graph/style.rs
index 44993c5e22..df50175cd0 100644
--- a/rust/pspp/src/spv/read/graph/style.rs
+++ b/rust/pspp/src/spv/read/graph/style.rs
@@ -75,9 +75,19 @@ pub struct Style {
     #[serde(rename = "@color")]
     pub color: Option<Color>,
 
+    /// The opacity of `color`, in the range 0 to 1, overriding the color's
+    /// alpha channel.
+    #[serde(rename = "@opacity")]
+    pub opacity: Option<f64>,
+
     #[serde(rename = "@color2")]
     pub color2: Option<Color>,
 
+    /// The opacity of `color2`, in the range 0 to 1, overriding the color's
+    /// alpha channel.
+    #[serde(rename = "@opacity2")]
+    pub opacity2: Option<f64>,
+
     #[serde(rename = "@visible")]
     pub visible: Option<bool>,
 
@@ -158,7 +168,9 @@ impl Style {
         Self {
             id: overrides.id.clone().or(self.id),
             color: overrides.color.or(self.color),
+            opacity: overrides.opacity.or(self.opacity),
             color2: overrides.color2.or(self.color2),
+            opacity2: overrides.opacity2.or(self.opacity2),
             visible: overrides.visible.or(self.visible),
             padding: overrides.padding.or(self.padding),
             pattern: overrides.pattern.or(self.pattern),
@@ -204,10 +216,28 @@ impl Style {
     pub fn fill(&self, patterns: &mut Patterns) -> String {
         patterns.insert(ColoredPattern {
             index: self.pattern.unwrap_or_default(),
-            color: self.color.unwrap_or(Color::BLACK),
-            color2: self.color2.unwrap_or(Color::WHITE),
+            color: self.color(Color::BLACK),
+            color2: self.color2(Color::WHITE),
         })
     }
+
+    fn color_with_opacity(color: Color, opacity: Option<f64>) -> Color {
+        if let Some(opacity) = opacity
+            && (0.0..=1.0).contains(&opacity)
+        {
+            color.with_alpha((opacity * 255.0) as u8)
+        } else {
+            color
+        }
+    }
+
+    pub fn color(&self, default: Color) -> Color {
+        Self::color_with_opacity(self.color.unwrap_or(default), self.opacity)
+    }
+
+    pub fn color2(&self, default: Color) -> Color {
+        Self::color_with_opacity(self.color2.unwrap_or(default), self.opacity2)
+    }
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Deserialize)]
diff --git a/rust/pspp/src/spv/testdata/graph1.expected.svg b/rust/pspp/src/spv/testdata/graph1.expected.svg
index f8c099091e..0a7ed7da0a 100644
--- a/rust/pspp/src/spv/testdata/graph1.expected.svg
+++ b/rust/pspp/src/spv/testdata/graph1.expected.svg
@@ -1,4 +1,4 @@
-<svg height="500" style="font-family: &quot;Sans Serif&quot;" viewBox="0 0 700 500" width="625" xmlns="http://www.w3.org/2000/svg" xmlns:c="http://www.example.org/">
+<svg height="500" style="font-family: &quot;Sans Serif&quot;" viewBox="0 0 625 500" width="625" xmlns="http://www.w3.org/2000/svg" xmlns:c="http://www.example.org/">
 <text dominant-baseline="hanging" font-family="sans-serif" id="frame_subtitle_1" x="0" y="28">
 Group Name
 </text>
@@ -6,71 +6,71 @@ Group Name
 ROC Curve
 </text>
 <g id="frame_data_1">
-<rect fill="#f0f0f0" height="332" stroke="#000000" width="501.5" x="117.25" y="51"/>
+<rect fill="#f0f0f0" height="388" stroke="#000000" width="557.5" x="61.25" y="51"/>
 <g id="element_simpleline_1">
-<path d="M618.75,51 L593.675,51 L568.6,51 L568.6,66.809525 L543.525,66.809525 L543.525,82.61905 L518.45,82.61905 L493.375,82.61905 L493.375,98.42857 L468.3,98.42857 L443.225,98.42857 L418.15,98.42857 L393.075,98.42857 L368,98.42857 L342.925,98.42857 L342.925,114.2381 L317.85,114.2381 L317.85,130.04762 L292.775,130.04762 L267.7,130.04762 L242.625,130.04762 L242.625,145.85715 L242.625,161.66667 L242.625,177.4762 L217.55,177.4762 L217.55,193.28572 L217.55,209.09525 L217.55,224.90475 L217.55,240.71428 L217.55,256.5238 L192.475,256.5238 L192.475,272.33334 L167.4,272.33334 L142.325,272.33334 L142.325,288.14285 L142.325,303.9524 L142.325,319.7619 L142.325,335.57144 L142.325,351.38095 L142.325,367.1905 L142.325,383 L117.25,383" fill="none" stroke="#3e58ac"/>
+<path d="M618.75,51 L590.875,51 L563,51 L563,69.47619 L535.125,69.47619 L535.125,87.95238 L507.25,87.95238 L479.375,87.95238 L479.375,106.42857 L451.5,106.42857 L423.625,106.42857 L395.75,106.42857 L367.875,106.42857 L340,106.42857 L312.125,106.42857 L312.125,124.90476 L284.25,124.90476 L284.25,143.38095 L256.375,143.38095 L228.5,143.38095 L200.625,143.38095 L200.625,161.85715 L200.625,180.33333 L200.625,198.80952 L172.75,198.80952 L172.75,217.28572 L172.75,235.7619 L172.75,254.2381 L172.75,272.7143 L172.75,291.1905 L144.875,291.1905 L144.875,309.66666 L117,309.66666 L89.125,309.66666 L89.125,328.14285 L89.125,346.61905 L89.125,365.09525 L89.125,383.57144 L89.125,402.0476 L89.125,420.5238 L89.125,439 L61.25,439" fill="none" stroke="#3e58ac"/>
 </g>
 <g id="element_simpleline_1">
-<path d="M117.25,383 L618.75,51" fill="none" stroke="#2eb848"/>
+<path d="M61.25,439 L618.75,51" fill="none" stroke="#2eb848"/>
 </g>
-<g c:description="X axis facets above graph" transform="translate(117.25 51)"/>
-<g c:description="X axis facets below graph" transform="translate(117.25 383)">
+<g c:description="X axis facets above graph" transform="translate(61.25 51)"/>
+<g c:description="X axis facets below graph" transform="translate(61.25 439)">
 <line stroke="black" x1="0" x2="0" y1="0" y2="10"/>
-<line stroke="black" x1="100.30000000000001" x2="100.30000000000001" y1="0" y2="10"/>
-<line stroke="black" x1="200.60000000000002" x2="200.60000000000002" y1="0" y2="10"/>
-<line stroke="black" x1="300.90000000000003" x2="300.90000000000003" y1="0" y2="10"/>
-<line stroke="black" x1="401.20000000000005" x2="401.20000000000005" y1="0" y2="10"/>
-<line stroke="black" x1="501.5" x2="501.5" y1="0" y2="10"/>
+<line stroke="black" x1="111.5" x2="111.5" y1="0" y2="10"/>
+<line stroke="black" x1="223" x2="223" y1="0" y2="10"/>
+<line stroke="black" x1="334.50000000000006" x2="334.50000000000006" y1="0" y2="10"/>
+<line stroke="black" x1="446" x2="446" y1="0" y2="10"/>
+<line stroke="black" x1="557.5" x2="557.5" y1="0" y2="10"/>
 <text dominant-baseline="hanging" text-anchor="middle" x="0" y="10">
 0
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="100.30000000000001" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="111.5" y="10">
 0,2
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="200.60000000000002" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="223" y="10">
 0,4
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="300.90000000000003" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="334.50000000000006" y="10">
 0,6
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="401.20000000000005" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="446" y="10">
 0,8
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="501.5" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="557.5" y="10">
 1
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="250.75" y="33">
+<text dominant-baseline="hanging" text-anchor="middle" x="278.75" y="33">
 X Axis
 </text>
 </g>
-<g c:description="Y axis facets on left side of graph" transform="rotate(-90 61.25 383) translate(61.25 383)">
-<text dominant-baseline="hanging" text-anchor="middle" x="166" y="0">
+<g c:description="Y axis facets on left side of graph" transform="rotate(-90 6.25 439) translate(6.25 439)">
+<text dominant-baseline="hanging" text-anchor="middle" x="194" y="0">
 Y Axis
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 0 36)" x="0" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 0 45)" x="0" y="45">
 0
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 66.4 36)" x="66.4" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 77.60000000000001 45)" x="77.60000000000001" y="45">
 0,2
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 132.8 36)" x="132.8" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 155.20000000000002 45)" x="155.20000000000002" y="45">
 0,4
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 199.20000000000002 36)" x="199.20000000000002" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 232.80000000000004 45)" x="232.80000000000004" y="45">
 0,6
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 265.6 36)" x="265.6" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 310.40000000000003 45)" x="310.40000000000003" y="45">
 0,8
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 332 36)" x="332" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 388 45)" x="388" y="45">
 1
 </text>
-<line stroke="black" x1="0" x2="0" y1="46" y2="56"/>
-<line stroke="black" x1="66.4" x2="66.4" y1="46" y2="56"/>
-<line stroke="black" x1="132.8" x2="132.8" y1="46" y2="56"/>
-<line stroke="black" x1="199.20000000000002" x2="199.20000000000002" y1="46" y2="56"/>
-<line stroke="black" x1="265.6" x2="265.6" y1="46" y2="56"/>
-<line stroke="black" x1="332" x2="332" y1="46" y2="56"/>
+<line stroke="black" x1="0" x2="0" y1="45" y2="55"/>
+<line stroke="black" x1="77.60000000000001" x2="77.60000000000001" y1="45" y2="55"/>
+<line stroke="black" x1="155.20000000000002" x2="155.20000000000002" y1="45" y2="55"/>
+<line stroke="black" x1="232.80000000000004" x2="232.80000000000004" y1="45" y2="55"/>
+<line stroke="black" x1="310.40000000000003" x2="310.40000000000003" y1="45" y2="55"/>
+<line stroke="black" x1="388" x2="388" y1="45" y2="55"/>
 </g>
 <g c:description="Y axis facets on right side of graph" transform="rotate(90 618.75 51) translate(618.75 51)"/>
 </g>
diff --git a/rust/pspp/src/spv/testdata/graph2.expected.svg b/rust/pspp/src/spv/testdata/graph2.expected.svg
index f1020c90ce..c343ab61ab 100644
--- a/rust/pspp/src/spv/testdata/graph2.expected.svg
+++ b/rust/pspp/src/spv/testdata/graph2.expected.svg
@@ -1,155 +1,155 @@
-<svg height="168" style="font-family: &quot;Sans Serif&quot;" viewBox="0 0 579 168" width="504" xmlns="http://www.w3.org/2000/svg" xmlns:c="http://www.example.org/">
+<svg height="168" style="font-family: &quot;Sans Serif&quot;" viewBox="0 0 504 168" width="504" xmlns="http://www.w3.org/2000/svg" xmlns:c="http://www.example.org/">
 <text dominant-baseline="hanging" font-family="sans-serif" id="frame_subtitle_1" x="0" y="0">
 Title
 </text>
 <g id="graph_11559">
 <g id="area_11560">
-<polygon fill="#f5f5f5" points="63.674999839782714 39.20000000000002 63.674999839782714 21.385253012048203 69.02499951934814 30.679903614457846 74.37499919891357 36.10178313253014 79.724998878479 37.65089156626508 85.07499855804444 38.425445783132545 90.42499823760986 38.425445783132545 117.174996635437 38.425445783132545 122.52499631500243 38.425445783132545 127.87499599456787 34.5526746987952 133.2249956741333 19.83614457831326 138.5749953536987 36.10178313253014 143.92499503326417 37.65089156626508 159.97499407196045 37.65089156626508 159.97499407196045 39.20000000000002" stroke="#000000"/>
+<polygon fill="#f5f5f5" points="31.499999839782717 95.20000000000002 31.499999839782717 51.93561445783134 38.49999951934814 74.5083373493976 45.49999919891357 87.6757590361446 52.49999887847899 91.43787951807231 59.49999855804444 93.31893975903617 66.49999823760986 93.31893975903617 101.499996635437 93.31893975903617 108.49999631500242 93.31893975903617 115.49999599456787 83.91363855421689 122.49999567413329 48.17349397590362 129.4999953536987 87.6757590361446 136.49999503326416 91.43787951807231 157.49999407196043 91.43787951807231 157.49999407196043 95.20000000000002" stroke="#000000"/>
 </g>
 <g id="area_11564">
-<polygon fill="#0000ff" points="117.174996635437 39.20000000000002 117.174996635437 37.63200000000001 122.52499631500243 37.63200000000001 127.87499599456787 29.792000000000012 133.2249956741333 0 138.5749953536987 32.92800000000001 143.92499503326417 36.064000000000014 159.97499407196045 36.064000000000014 159.97499407196045 39.20000000000002" stroke="#000000"/>
+<polygon fill="rgb(0, 0, 255, 0.50)" points="101.499996635437 95.20000000000002 101.499996635437 91.39200000000001 108.49999631500242 91.39200000000001 115.49999599456787 72.35200000000002 122.49999567413329 0 129.4999953536987 79.96800000000002 136.49999503326416 87.58400000000002 157.49999407196043 87.58400000000002 157.49999407196043 95.20000000000002" stroke="#000000"/>
 </g>
-<g c:description="X axis facets above graph" transform="translate(61 0)"/>
-<g c:description="X axis facets below graph" transform="translate(61 39.20000000000002)">
-<line stroke="black" x1="31.137102797601216" x2="31.137102797601216" y1="0" y2="10"/>
-<line stroke="black" x1="74.7464904693116" x2="74.7464904693116" y1="0" y2="10"/>
-<text dominant-baseline="hanging" text-anchor="middle" x="31.137102797601216" y="10">
+<g c:description="X axis facets above graph" transform="translate(28 0)"/>
+<g c:description="X axis facets below graph" transform="translate(28 95.20000000000002)">
+<line stroke="black" x1="40.740135076701314" x2="40.740135076701314" y1="0" y2="10"/>
+<line stroke="black" x1="97.79914778916813" x2="97.79914778916813" y1="0" y2="10"/>
+<text dominant-baseline="hanging" text-anchor="middle" x="40.740135076701314" y="10">
 10
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="74.7464904693116" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="97.79914778916813" y="10">
 15
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="53.4999967956543" y="33">
+<text dominant-baseline="hanging" text-anchor="middle" x="69.9999967956543" y="33">
 V2
 </text>
 </g>
-<g c:description="Y axis facets on left side of graph" transform="rotate(-90 28 39.20000000000002) translate(28 39.20000000000002)">
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 0 13)" x="0" y="13">
+<g c:description="Y axis facets on left side of graph" transform="rotate(-90 0 95.20000000000002) translate(0 95.20000000000002)">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 0 18)" x="0" y="18">
 0
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 6.428800000000003 13)" x="6.428800000000003" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 15.612800000000004 18)" x="15.612800000000004" y="18">
 10
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 12.857600000000007 13)" x="12.857600000000007" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 31.225600000000007 18)" x="31.225600000000007" y="18">
 20
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 19.286400000000008 13)" x="19.286400000000008" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 46.83840000000001 18)" x="46.83840000000001" y="18">
 30
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 25.715200000000014 13)" x="25.715200000000014" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 62.451200000000014 18)" x="62.451200000000014" y="18">
 40
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 32.14400000000001 13)" x="32.14400000000001" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 78.06400000000001 18)" x="78.06400000000001" y="18">
 50
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 38.572800000000015 13)" x="38.572800000000015" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 93.67680000000001 18)" x="93.67680000000001" y="18">
 60
 </text>
-<line stroke="black" x1="0" x2="0" y1="23" y2="33"/>
-<line stroke="black" x1="6.428800000000003" x2="6.428800000000003" y1="23" y2="33"/>
-<line stroke="black" x1="12.857600000000007" x2="12.857600000000007" y1="23" y2="33"/>
-<line stroke="black" x1="19.286400000000008" x2="19.286400000000008" y1="23" y2="33"/>
-<line stroke="black" x1="25.715200000000014" x2="25.715200000000014" y1="23" y2="33"/>
-<line stroke="black" x1="32.14400000000001" x2="32.14400000000001" y1="23" y2="33"/>
-<line stroke="black" x1="38.572800000000015" x2="38.572800000000015" y1="23" y2="33"/>
+<line stroke="black" x1="0" x2="0" y1="18" y2="28"/>
+<line stroke="black" x1="15.612800000000004" x2="15.612800000000004" y1="18" y2="28"/>
+<line stroke="black" x1="31.225600000000007" x2="31.225600000000007" y1="18" y2="28"/>
+<line stroke="black" x1="46.83840000000001" x2="46.83840000000001" y1="18" y2="28"/>
+<line stroke="black" x1="62.451200000000014" x2="62.451200000000014" y1="18" y2="28"/>
+<line stroke="black" x1="78.06400000000001" x2="78.06400000000001" y1="18" y2="28"/>
+<line stroke="black" x1="93.67680000000001" x2="93.67680000000001" y1="18" y2="28"/>
 </g>
 <g c:description="Y axis facets on right side of graph" transform="rotate(90 167.9999935913086 0) translate(167.9999935913086 0)"/>
 </g>
 <g id="graph_11578">
 <g id="area_11579">
-<polygon fill="#f5f5f5" points="231.67499343109102 39.20000000000002 231.67499343109102 38.19487179487181 247.7249924697875 34.17435897435899 258.42499182891817 35.1794871794872 263.774991508484 36.184615384615405 274.4749908676147 38.19487179487181 285.1749902267453 38.19487179487181 290.52498990631113 34.17435897435899 301.22498926544176 37.18974358974361 311.92498862457245 31.158974358974376 317.2749883041383 0 327.97498766326896 30.153846153846168 327.97498766326896 39.20000000000002" stroke="#000000"/>
+<polygon fill="#f5f5f5" points="199.49999343109093 95.20000000000002 199.49999343109093 92.75897435897437 220.49999246978746 82.99487179487181 234.49999182891807 85.43589743589746 241.49999150848402 87.87692307692309 255.49999086761463 92.75897435897437 269.49999022674524 92.75897435897437 276.49998990631116 82.99487179487181 290.49998926544174 90.31794871794872 304.4999886245724 75.67179487179489 311.4999883041383 0 325.49998766326894 73.23076923076925 325.49998766326894 95.20000000000002" stroke="#000000"/>
 </g>
 <g id="area_11583">
-<polygon fill="#0000ff" points="231.67499343109102 39.20000000000002 231.67499343109102 37.02222222222224 247.7249924697875 28.311111111111124 258.42499182891817 30.4888888888889 263.774991508484 32.666666666666686 274.4749908676147 37.02222222222224 285.1749902267453 37.02222222222224 290.52498990631113 30.4888888888889 311.92498862457245 32.666666666666686 317.2749883041383 26.133333333333347 327.97498766326896 21.77777777777779 327.97498766326896 39.20000000000002" stroke="#000000"/>
+<polygon fill="rgb(0, 0, 255, 0.50)" points="199.49999343109093 95.20000000000002 199.49999343109093 89.91111111111113 220.49999246978746 68.75555555555556 234.49999182891807 74.04444444444447 241.49999150848402 79.33333333333336 255.49999086761463 89.91111111111113 269.49999022674524 89.91111111111113 276.49998990631116 74.04444444444447 304.4999886245724 79.33333333333336 311.4999883041383 63.46666666666668 325.49998766326894 52.8888888888889 325.49998766326894 95.20000000000002" stroke="#000000"/>
 </g>
-<g c:description="X axis facets above graph" transform="translate(228.9999935913086 0)"/>
-<g c:description="X axis facets below graph" transform="translate(228.9999935913086 39.20000000000002)">
-<line stroke="black" x1="8.91666613261004" x2="8.91666613261004" y1="0" y2="10"/>
-<line stroke="black" x1="53.499996795655285" x2="53.499996795655285" y1="0" y2="10"/>
-<line stroke="black" x1="98.08332745870054" x2="98.08332745870054" y1="0" y2="10"/>
-<text dominant-baseline="hanging" text-anchor="middle" x="8.91666613261004" y="10">
+<g c:description="X axis facets above graph" transform="translate(195.9999935913086 0)"/>
+<g c:description="X axis facets below graph" transform="translate(195.9999935913086 95.20000000000002)">
+<line stroke="black" x1="11.666666132610345" x2="11.666666132610345" y1="0" y2="10"/>
+<line stroke="black" x1="69.99999679565559" x2="69.99999679565559" y1="0" y2="10"/>
+<line stroke="black" x1="128.33332745870084" x2="128.33332745870084" y1="0" y2="10"/>
+<text dominant-baseline="hanging" text-anchor="middle" x="11.666666132610345" y="10">
 0.575
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="53.499996795655285" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="69.99999679565559" y="10">
 0.58
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="98.08332745870054" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="128.33332745870084" y="10">
 0.585
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="53.4999967956543" y="33">
+<text dominant-baseline="hanging" text-anchor="middle" x="69.9999967956543" y="33">
 V1
 </text>
 </g>
-<g c:description="Y axis facets on left side of graph" transform="rotate(-90 195.9999935913086 39.20000000000002) translate(195.9999935913086 39.20000000000002)">
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 0 13)" x="0" y="13">
+<g c:description="Y axis facets on left side of graph" transform="rotate(-90 167.9999935913086 95.20000000000002) translate(167.9999935913086 95.20000000000002)">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 0 18)" x="0" y="18">
 0
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 7.840000000000003 13)" x="7.840000000000003" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 19.040000000000003 18)" x="19.040000000000003" y="18">
 10
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 15.680000000000007 13)" x="15.680000000000007" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 38.080000000000005 18)" x="38.080000000000005" y="18">
 20
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 23.52000000000001 13)" x="23.52000000000001" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 57.12000000000001 18)" x="57.12000000000001" y="18">
 30
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 31.360000000000014 13)" x="31.360000000000014" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 76.16000000000001 18)" x="76.16000000000001" y="18">
 40
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 39.20000000000002 13)" x="39.20000000000002" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 95.20000000000002 18)" x="95.20000000000002" y="18">
 50
 </text>
-<line stroke="black" x1="0" x2="0" y1="23" y2="33"/>
-<line stroke="black" x1="7.840000000000003" x2="7.840000000000003" y1="23" y2="33"/>
-<line stroke="black" x1="15.680000000000007" x2="15.680000000000007" y1="23" y2="33"/>
-<line stroke="black" x1="23.52000000000001" x2="23.52000000000001" y1="23" y2="33"/>
-<line stroke="black" x1="31.360000000000014" x2="31.360000000000014" y1="23" y2="33"/>
-<line stroke="black" x1="39.20000000000002" x2="39.20000000000002" y1="23" y2="33"/>
+<line stroke="black" x1="0" x2="0" y1="18" y2="28"/>
+<line stroke="black" x1="19.040000000000003" x2="19.040000000000003" y1="18" y2="28"/>
+<line stroke="black" x1="38.080000000000005" x2="38.080000000000005" y1="18" y2="28"/>
+<line stroke="black" x1="57.12000000000001" x2="57.12000000000001" y1="18" y2="28"/>
+<line stroke="black" x1="76.16000000000001" x2="76.16000000000001" y1="18" y2="28"/>
+<line stroke="black" x1="95.20000000000002" x2="95.20000000000002" y1="18" y2="28"/>
 </g>
 <g c:description="Y axis facets on right side of graph" transform="rotate(90 335.9999871826172 0) translate(335.9999871826172 0)"/>
 </g>
 <g id="graph_11597">
 <g id="area_11598">
-<polygon fill="#f5f5f5" points="399.67498750305174 39.20000000000002 399.67498750305174 36.220945319740515 410.37498878479005 37.71047265987027 415.7249894256592 27.283781278962014 421.0749900665283 13.878035217794263 426.42499070739746 9.409453197405007 431.7749913482666 19.83614457831326 437.12499198913576 24.304726598702512 442.47499263000486 27.283781278962014 447.824993270874 37.71047265987027 458.52499455261227 37.71047265987027 474.57499647521973 37.71047265987027 490.62499839782714 37.71047265987027 490.62499839782714 39.20000000000002" stroke="#000000"/>
+<polygon fill="#f5f5f5" points="367.4999875030518 95.20000000000002 367.4999875030518 87.9651529193698 381.49998878479005 91.58257645968492 388.4999894256592 66.26061167747916 395.4999900665283 33.7037998146432 402.49999070739744 22.851529193697868 409.4999913482666 48.17349397590362 416.49999198913576 59.025764596848944 423.4999926300049 66.26061167747916 430.49999327087403 91.58257645968492 444.4999945526123 91.58257645968492 465.49999647521975 91.58257645968492 486.49999839782714 91.58257645968492 486.49999839782714 95.20000000000002" stroke="#000000"/>
 </g>
 <g id="area_11602">
-<polygon fill="#0000ff" points="415.7249894256592 39.20000000000002 415.7249894256592 21.10769230769232 421.0749900665283 0 426.42499070739746 6.03076923076923 431.7749913482666 18.092307692307696 437.12499198913576 33.169230769230786 474.57499647521973 36.184615384615405 490.62499839782714 36.184615384615405 490.62499839782714 39.20000000000002" stroke="#000000"/>
+<polygon fill="rgb(0, 0, 255, 0.50)" points="388.4999894256592 95.20000000000002 388.4999894256592 51.26153846153848 395.4999900665283 0 402.49999070739744 14.646153846153839 409.4999913482666 43.93846153846154 416.49999198913576 80.55384615384617 465.49999647521975 87.87692307692309 486.49999839782714 87.87692307692309 486.49999839782714 95.20000000000002" stroke="#000000"/>
 </g>
-<g c:description="X axis facets above graph" transform="translate(396.9999871826172 0)"/>
-<g c:description="X axis facets below graph" transform="translate(396.9999871826172 39.20000000000002)">
-<line stroke="black" x1="11.22931343481646" x2="11.22931343481646" y1="0" y2="10"/>
-<line stroke="black" x1="46.80040669604799" x2="46.80040669604799" y1="0" y2="10"/>
-<line stroke="black" x1="82.37149995727953" x2="82.37149995727953" y1="0" y2="10"/>
-<text dominant-baseline="hanging" text-anchor="middle" x="11.22931343481646" y="10">
+<g c:description="X axis facets above graph" transform="translate(363.9999871826172 0)"/>
+<g c:description="X axis facets below graph" transform="translate(363.9999871826172 95.20000000000002)">
+<line stroke="black" x1="14.692559219481844" x2="14.692559219481844" y1="0" y2="10"/>
+<line stroke="black" x1="61.234175256482075" x2="61.234175256482075" y1="0" y2="10"/>
+<line stroke="black" x1="107.7757912934823" x2="107.7757912934823" y1="0" y2="10"/>
+<text dominant-baseline="hanging" text-anchor="middle" x="14.692559219481844" y="10">
 30
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="46.80040669604799" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="61.234175256482075" y="10">
 35
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="82.37149995727953" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="107.7757912934823" y="10">
 40
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="53.500006408691405" y="33">
+<text dominant-baseline="hanging" text-anchor="middle" x="70.0000064086914" y="33">
 V3
 </text>
 </g>
-<g c:description="Y axis facets on left side of graph" transform="rotate(-90 363.9999871826172 39.20000000000002) translate(363.9999871826172 39.20000000000002)">
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 0 13)" x="0" y="13">
+<g c:description="Y axis facets on left side of graph" transform="rotate(-90 335.9999871826172 95.20000000000002) translate(335.9999871826172 95.20000000000002)">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 0 18)" x="0" y="18">
 0
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 12.363076923076928 13)" x="12.363076923076928" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 30.024615384615387 18)" x="30.024615384615387" y="18">
 10
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 24.726153846153856 13)" x="24.726153846153856" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 60.049230769230775 18)" x="60.049230769230775" y="18">
 20
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 37.08923076923078 13)" x="37.08923076923078" y="13">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 90.07384615384616 18)" x="90.07384615384616" y="18">
 30
 </text>
-<line stroke="black" x1="0" x2="0" y1="23" y2="33"/>
-<line stroke="black" x1="12.363076923076928" x2="12.363076923076928" y1="23" y2="33"/>
-<line stroke="black" x1="24.726153846153856" x2="24.726153846153856" y1="23" y2="33"/>
-<line stroke="black" x1="37.08923076923078" x2="37.08923076923078" y1="23" y2="33"/>
+<line stroke="black" x1="0" x2="0" y1="18" y2="28"/>
+<line stroke="black" x1="30.024615384615387" x2="30.024615384615387" y1="18" y2="28"/>
+<line stroke="black" x1="60.049230769230775" x2="60.049230769230775" y1="18" y2="28"/>
+<line stroke="black" x1="90.07384615384616" x2="90.07384615384616" y1="18" y2="28"/>
 </g>
 <g c:description="Y axis facets on right side of graph" transform="rotate(90 504 0) translate(504 0)"/>
 </g>
diff --git a/rust/pspp/src/spv/testdata/graph3.expected.svg b/rust/pspp/src/spv/testdata/graph3.expected.svg
index 8e6c3dcb0d..aac1b3ece2 100644
--- a/rust/pspp/src/spv/testdata/graph3.expected.svg
+++ b/rust/pspp/src/spv/testdata/graph3.expected.svg
@@ -1,14 +1,14 @@
-<svg height="500" style="font-family: &quot;Sans Serif&quot;" viewBox="0 0 700 500" width="625" xmlns="http://www.w3.org/2000/svg" xmlns:c="http://www.example.org/">
+<svg height="500" style="font-family: &quot;Sans Serif&quot;" viewBox="0 0 625 500" width="625" xmlns="http://www.w3.org/2000/svg" xmlns:c="http://www.example.org/">
 <g id="frame_data_1">
-<rect fill="#f0f0f0" height="186.5" stroke="#000000" width="433.5" x="139.25" y="5"/>
+<rect fill="#f0f0f0" height="214.5" stroke="#000000" width="489.5" x="83.25" y="5"/>
 <g id="element_bar_1">
-<rect fill="url(#pattern12_d3ce97_000000)" height="80.48363095238096" stroke="#000000" width="162.5625" x="166.34375" y="111.01636904761904"/>
-<rect fill="url(#pattern12_d3ce97_000000)" height="177.61904761904762" stroke="#000000" width="162.5625" x="383.09375" y="13.88095238095237"/>
+<rect fill="url(#pattern12_d3ce97_000000)" height="92.56696428571429" stroke="#000000" width="183.5625" x="113.84375" y="126.93303571428571"/>
+<rect fill="url(#pattern12_d3ce97_000000)" height="204.2857142857143" stroke="#000000" width="183.5625" x="358.59375" y="15.214285714285701"/>
 </g>
-<rect fill="#f0f0f0" height="186.5" stroke="#000000" width="433.5" x="139.25" y="196.5"/>
+<rect fill="#f0f0f0" height="214.5" stroke="#000000" width="489.5" x="83.25" y="224.5"/>
 <g id="element_bar_1">
-<rect fill="url(#pattern12_d3ce97_000000)" height="105.46130952380952" stroke="#000000" width="162.5625" x="166.34375" y="277.5386904761905"/>
-<rect fill="url(#pattern12_d3ce97_000000)" height="111.01190476190482" stroke="#000000" width="162.5625" x="383.09375" y="271.9880952380952"/>
+<rect fill="url(#pattern12_d3ce97_000000)" height="121.29464285714289" stroke="#000000" width="183.5625" x="113.84375" y="317.7053571428571"/>
+<rect fill="url(#pattern12_d3ce97_000000)" height="127.67857142857144" stroke="#000000" width="183.5625" x="358.59375" y="311.32142857142856"/>
 </g>
 <defs>
 <pattern fill="#d3ce97" height="8" id="pattern12_d3ce97_000000" patternUnits="userSpaceOnUse" width="8">
@@ -20,65 +20,65 @@
     
 </pattern>
 </defs>
-<g c:description="X axis facets above graph" transform="translate(139.25 5)"/>
-<g c:description="X axis facets below graph" transform="translate(139.25 383)">
-<line stroke="black" x1="108.375" x2="108.375" y1="0" y2="10"/>
-<line stroke="black" x1="325.125" x2="325.125" y1="0" y2="10"/>
-<text dominant-baseline="hanging" text-anchor="middle" x="108.375" y="10">
+<g c:description="X axis facets above graph" transform="translate(83.25 5)"/>
+<g c:description="X axis facets below graph" transform="translate(83.25 439)">
+<line stroke="black" x1="122.375" x2="122.375" y1="0" y2="10"/>
+<line stroke="black" x1="367.125" x2="367.125" y1="0" y2="10"/>
+<text dominant-baseline="hanging" text-anchor="middle" x="122.375" y="10">
 Value0
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="325.125" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="367.125" y="10">
 Value1
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="216.75" y="33">
+<text dominant-baseline="hanging" text-anchor="middle" x="244.75" y="33">
 V0
 </text>
 </g>
-<g c:description="Y axis facets on left side of graph" transform="rotate(-90 83.25 383) translate(83.25 383)">
-<text dominant-baseline="hanging" text-anchor="middle" x="189" y="0">
+<g c:description="Y axis facets on left side of graph" transform="rotate(-90 6.25 439) translate(6.25 439)">
+<text dominant-baseline="hanging" text-anchor="middle" x="217" y="0">
 Percent
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 0 36)" x="0" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 0 67)" x="0" y="67">
 .0%
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 47.45758928571429 36)" x="47.45758928571429" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 54.58258928571429 67)" x="54.58258928571429" y="67">
 10.0%
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 94.91517857142858 36)" x="94.91517857142858" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 109.16517857142858 67)" x="109.16517857142858" y="67">
 20.0%
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 142.37276785714286 36)" x="142.37276785714286" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 163.74776785714286 67)" x="163.74776785714286" y="67">
 30.0%
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 191.5 36)" x="191.5" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 219.5 67)" x="219.5" y="67">
 .0%
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 238.95758928571428 36)" x="238.95758928571428" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 274.0825892857143 67)" x="274.0825892857143" y="67">
 10.0%
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 286.41517857142856 36)" x="286.41517857142856" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 328.66517857142856 67)" x="328.66517857142856" y="67">
 20.0%
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 333.8727678571429 36)" x="333.8727678571429" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 383.2477678571429 67)" x="383.2477678571429" y="67">
 30.0%
 </text>
-<line stroke="black" x1="0" x2="0" y1="46" y2="56"/>
-<line stroke="black" x1="47.45758928571429" x2="47.45758928571429" y1="46" y2="56"/>
-<line stroke="black" x1="94.91517857142858" x2="94.91517857142858" y1="46" y2="56"/>
-<line stroke="black" x1="142.37276785714286" x2="142.37276785714286" y1="46" y2="56"/>
-<line stroke="black" x1="191.5" x2="191.5" y1="46" y2="56"/>
-<line stroke="black" x1="238.95758928571428" x2="238.95758928571428" y1="46" y2="56"/>
-<line stroke="black" x1="286.41517857142856" x2="286.41517857142856" y1="46" y2="56"/>
-<line stroke="black" x1="333.8727678571429" x2="333.8727678571429" y1="46" y2="56"/>
+<line stroke="black" x1="0" x2="0" y1="67" y2="77"/>
+<line stroke="black" x1="54.58258928571429" x2="54.58258928571429" y1="67" y2="77"/>
+<line stroke="black" x1="109.16517857142858" x2="109.16517857142858" y1="67" y2="77"/>
+<line stroke="black" x1="163.74776785714286" x2="163.74776785714286" y1="67" y2="77"/>
+<line stroke="black" x1="219.5" x2="219.5" y1="67" y2="77"/>
+<line stroke="black" x1="274.0825892857143" x2="274.0825892857143" y1="67" y2="77"/>
+<line stroke="black" x1="328.66517857142856" x2="328.66517857142856" y1="67" y2="77"/>
+<line stroke="black" x1="383.2477678571429" x2="383.2477678571429" y1="67" y2="77"/>
 </g>
 <g c:description="Y axis facets on right side of graph" transform="rotate(90 618.75 5) translate(618.75 5)">
-<text dominant-baseline="hanging" text-anchor="middle" x="189" y="0">
+<text dominant-baseline="hanging" text-anchor="middle" x="217" y="0">
 Graph0
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="93.25" y="23">
+<text dominant-baseline="hanging" text-anchor="middle" x="107.25" y="23">
 no
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="284.75" y="23">
+<text dominant-baseline="hanging" text-anchor="middle" x="326.75" y="23">
 yes
 </text>
 </g>
diff --git a/rust/pspp/src/spv/testdata/graph4.expected.svg b/rust/pspp/src/spv/testdata/graph4.expected.svg
index ee53b57d3f..7b15361785 100644
--- a/rust/pspp/src/spv/testdata/graph4.expected.svg
+++ b/rust/pspp/src/spv/testdata/graph4.expected.svg
@@ -1,27 +1,27 @@
-<svg height="500" style="font-family: &quot;Sans Serif&quot;" viewBox="0 0 700 500" width="625" xmlns="http://www.w3.org/2000/svg" xmlns:c="http://www.example.org/">
+<svg height="500" style="font-family: &quot;Sans Serif&quot;" viewBox="0 0 625 500" width="625" xmlns="http://www.w3.org/2000/svg" xmlns:c="http://www.example.org/">
 <g id="frame_pie_1">
-<rect fill="rgb(0, 0, 0, 0.00)" height="226" stroke="rgb(0, 0, 0, 0.00)" width="397.5" x="25.25" y="5"/>
+<rect fill="rgb(0, 0, 0, 0.00)" height="242.5" stroke="rgb(0, 0, 0, 0.00)" width="416.5" x="6.25" y="5"/>
 <g id="element_element_1">
-<rect fill="#2eb848" height="113" stroke="#000000" width="1" x="422.75" y="118"/>
+<rect fill="#2eb848" height="121.25" stroke="#000000" width="1" x="422.75" y="126.25"/>
 </g>
-<rect fill="rgb(0, 0, 0, 0.00)" height="226" stroke="rgb(0, 0, 0, 0.00)" width="397.5" x="25.25" y="236"/>
+<rect fill="rgb(0, 0, 0, 0.00)" height="242.5" stroke="rgb(0, 0, 0, 0.00)" width="416.5" x="6.25" y="252.5"/>
 <g id="element_element_1">
-<rect fill="#3e58ac" height="113" stroke="#000000" width="1" x="217.58870967741936" y="349"/>
+<rect fill="#3e58ac" height="121.25" stroke="#000000" width="1" x="207.78225806451613" y="373.75"/>
 </g>
 <g id="element_element_1">
-<rect fill="#2eb848" height="113" stroke="#000000" width="1" x="166.29838709677423" y="349"/>
+<rect fill="#2eb848" height="121.25" stroke="#000000" width="1" x="154.04032258064518" y="373.75"/>
 </g>
-<g c:description="X axis facets above graph" transform="translate(25.25 5)"/>
-<g c:description="X axis facets below graph" transform="translate(25.25 462)"/>
-<g c:description="Y axis facets on left side of graph" transform="rotate(-90 25.25 462) translate(25.25 462)"/>
+<g c:description="X axis facets above graph" transform="translate(6.25 5)"/>
+<g c:description="X axis facets below graph" transform="translate(6.25 495)"/>
+<g c:description="Y axis facets on left side of graph" transform="rotate(-90 6.25 495) translate(6.25 495)"/>
 <g c:description="Y axis facets on right side of graph" transform="rotate(90 468.75 5) translate(468.75 5)">
-<text dominant-baseline="hanging" text-anchor="middle" x="228.5" y="0">
+<text dominant-baseline="hanging" text-anchor="middle" x="245" y="0">
 Graph0
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="113" y="23">
+<text dominant-baseline="hanging" text-anchor="middle" x="121.25" y="23">
 no
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="344" y="23">
+<text dominant-baseline="hanging" text-anchor="middle" x="368.75" y="23">
 yes
 </text>
 </g>
diff --git a/rust/pspp/src/spv/testdata/graph5.expected.svg b/rust/pspp/src/spv/testdata/graph5.expected.svg
index 4afd31b926..006738198c 100644
--- a/rust/pspp/src/spv/testdata/graph5.expected.svg
+++ b/rust/pspp/src/spv/testdata/graph5.expected.svg
@@ -1,201 +1,201 @@
-<svg height="500" style="font-family: &quot;Sans Serif&quot;" viewBox="0 0 700 500" width="625" xmlns="http://www.w3.org/2000/svg" xmlns:c="http://www.example.org/">
+<svg height="500" style="font-family: &quot;Sans Serif&quot;" viewBox="0 0 625 500" width="625" xmlns="http://www.w3.org/2000/svg" xmlns:c="http://www.example.org/">
 <g id="frame_data_1">
-<rect fill="#f0f0f0" height="79.25" stroke="#000000" width="231.75" x="104.25" y="51"/>
+<rect fill="#f0f0f0" height="93.25" stroke="#000000" width="259.75" x="48.25" y="51"/>
 <g id="element_histogram_1">
-<rect fill="#d3ce97" height="75.47619047619048" stroke="#000000" width="38.23874999999998" x="143.068125" y="54.77380952380952"/>
-<rect fill="#d3ce97" height="37.73809523809524" stroke="#000000" width="38.23874999999998" x="258.943125" y="92.51190476190476"/>
+<rect fill="#d3ce97" height="88.80952380952382" stroke="#000000" width="42.858749999999986" x="91.758125" y="55.44047619047618"/>
+<rect fill="#d3ce97" height="44.40476190476191" stroke="#000000" width="42.858749999999986" x="221.633125" y="99.84523809523809"/>
 </g>
-<rect fill="#f0f0f0" height="79.25" stroke="#000000" width="231.75" x="104.25" y="135.25"/>
+<rect fill="#f0f0f0" height="93.25" stroke="#000000" width="259.75" x="48.25" y="149.25"/>
 <g id="element_histogram_1">
-<rect fill="#d3ce97" height="75.47619047619048" stroke="#000000" width="38.23874999999998" x="143.068125" y="139.02380952380952"/>
+<rect fill="#d3ce97" height="88.80952380952382" stroke="#000000" width="42.858749999999986" x="91.758125" y="153.69047619047618"/>
 </g>
-<rect fill="#f0f0f0" height="79.25" stroke="#000000" width="231.75" x="104.25" y="219.5"/>
+<rect fill="#f0f0f0" height="93.25" stroke="#000000" width="259.75" x="48.25" y="247.5"/>
 <g id="element_histogram_1">
-<rect fill="#d3ce97" height="37.73809523809524" stroke="#000000" width="38.23874999999998" x="258.943125" y="261.01190476190476"/>
+<rect fill="#d3ce97" height="44.404761904761926" stroke="#000000" width="42.858749999999986" x="221.633125" y="296.3452380952381"/>
 </g>
-<rect fill="#f0f0f0" height="79.25" stroke="#000000" width="231.75" x="104.25" y="303.75"/>
+<rect fill="#f0f0f0" height="93.25" stroke="#000000" width="259.75" x="48.25" y="345.75"/>
 <g id="element_histogram_1">
-<rect fill="#d3ce97" height="75.47619047619048" stroke="#000000" width="38.23874999999998" x="143.068125" y="307.5238095238095"/>
+<rect fill="#d3ce97" height="88.8095238095238" stroke="#000000" width="42.858749999999986" x="91.758125" y="350.1904761904762"/>
 </g>
-<rect fill="#f0f0f0" height="79.25" stroke="#000000" width="231.75" x="341" y="51"/>
+<rect fill="#f0f0f0" height="93.25" stroke="#000000" width="259.75" x="313" y="51"/>
 <g id="element_histogram_1">
-<rect fill="#d3ce97" height="75.47619047619048" stroke="#000000" width="38.23874999999998" x="379.818125" y="54.77380952380952"/>
+<rect fill="#d3ce97" height="88.80952380952382" stroke="#000000" width="42.858749999999986" x="356.508125" y="55.44047619047618"/>
 </g>
-<rect fill="#f0f0f0" height="79.25" stroke="#000000" width="231.75" x="341" y="135.25"/>
+<rect fill="#f0f0f0" height="93.25" stroke="#000000" width="259.75" x="313" y="149.25"/>
 <g id="element_histogram_1">
-<rect fill="#d3ce97" height="75.47619047619048" stroke="#000000" width="38.23874999999998" x="379.818125" y="139.02380952380952"/>
+<rect fill="#d3ce97" height="88.80952380952382" stroke="#000000" width="42.858749999999986" x="356.508125" y="153.69047619047618"/>
 </g>
-<rect fill="#f0f0f0" height="79.25" stroke="#000000" width="231.75" x="341" y="219.5"/>
+<rect fill="#f0f0f0" height="93.25" stroke="#000000" width="259.75" x="313" y="247.5"/>
 <g id="element_histogram_1">
-<rect fill="#d3ce97" height="75.47619047619048" stroke="#000000" width="38.23874999999998" x="379.818125" y="223.27380952380952"/>
+<rect fill="#d3ce97" height="88.80952380952382" stroke="#000000" width="42.858749999999986" x="356.508125" y="251.94047619047618"/>
 </g>
-<rect fill="#f0f0f0" height="79.25" stroke="#000000" width="231.75" x="341" y="303.75"/>
+<rect fill="#f0f0f0" height="93.25" stroke="#000000" width="259.75" x="313" y="345.75"/>
 <g id="element_histogram_1">
-<rect fill="#d3ce97" height="37.73809523809524" stroke="#000000" width="38.23874999999998" x="495.693125" y="345.26190476190476"/>
+<rect fill="#d3ce97" height="44.404761904761926" stroke="#000000" width="42.85875000000004" x="486.383125" y="394.5952380952381"/>
 </g>
-<g c:description="X axis facets above graph" transform="translate(104.25 5)">
-<text dominant-baseline="hanging" text-anchor="middle" x="234.25" y="0">
+<g c:description="X axis facets above graph" transform="translate(48.25 5)">
+<text dominant-baseline="hanging" text-anchor="middle" x="262.25" y="0">
 Variable 11
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="115.875" y="23">
+<text dominant-baseline="hanging" text-anchor="middle" x="129.875" y="23">
 V11-1
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="352.625" y="23">
+<text dominant-baseline="hanging" text-anchor="middle" x="394.625" y="23">
 V11-2
 </text>
 </g>
-<g c:description="X axis facets below graph" transform="translate(104.25 383)">
-<line stroke="black" x1="57.9375" x2="57.9375" y1="0" y2="10"/>
-<line stroke="black" x1="173.8125" x2="173.8125" y1="0" y2="10"/>
-<line stroke="black" x1="294.6875" x2="294.6875" y1="0" y2="10"/>
-<line stroke="black" x1="410.5625" x2="410.5625" y1="0" y2="10"/>
-<text dominant-baseline="hanging" text-anchor="middle" x="57.9375" y="10">
+<g c:description="X axis facets below graph" transform="translate(48.25 439)">
+<line stroke="black" x1="64.9375" x2="64.9375" y1="0" y2="10"/>
+<line stroke="black" x1="194.8125" x2="194.8125" y1="0" y2="10"/>
+<line stroke="black" x1="329.6875" x2="329.6875" y1="0" y2="10"/>
+<line stroke="black" x1="459.5625" x2="459.5625" y1="0" y2="10"/>
+<text dominant-baseline="hanging" text-anchor="middle" x="64.9375" y="10">
 101.10
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="173.8125" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="194.8125" y="10">
 102.10
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="294.6875" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="329.6875" y="10">
 101.10
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="410.5625" y="10">
+<text dominant-baseline="hanging" text-anchor="middle" x="459.5625" y="10">
 102.10
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="234.25" y="33">
+<text dominant-baseline="hanging" text-anchor="middle" x="262.25" y="33">
 Variable 4
 </text>
 </g>
-<g c:description="Y axis facets on left side of graph" transform="rotate(-90 48.25 383) translate(48.25 383)">
-<text dominant-baseline="hanging" text-anchor="middle" x="166" y="0">
+<g c:description="Y axis facets on left side of graph" transform="rotate(-90 6.25 439) translate(6.25 439)">
+<text dominant-baseline="hanging" text-anchor="middle" x="194" y="0">
 Frequency
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 0 36)" x="0" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 0 32)" x="0" y="32">
 0
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 12.579365079365079 36)" x="12.579365079365079" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 14.8015873015873 32)" x="14.8015873015873" y="32">
 1
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 25.158730158730158 36)" x="25.158730158730158" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 29.6031746031746 32)" x="29.6031746031746" y="32">
 2
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 37.73809523809524 36)" x="37.73809523809524" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 44.404761904761905 32)" x="44.404761904761905" y="32">
 3
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 50.317460317460316 36)" x="50.317460317460316" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 59.2063492063492 32)" x="59.2063492063492" y="32">
 4
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 62.8968253968254 36)" x="62.8968253968254" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 74.00793650793652 32)" x="74.00793650793652" y="32">
 5
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 75.47619047619048 36)" x="75.47619047619048" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 88.80952380952381 32)" x="88.80952380952381" y="32">
 6
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 84.25 36)" x="84.25" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 98.25 32)" x="98.25" y="32">
 0
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 96.82936507936508 36)" x="96.82936507936508" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 113.0515873015873 32)" x="113.0515873015873" y="32">
 1
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 109.40873015873015 36)" x="109.40873015873015" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 127.85317460317461 32)" x="127.85317460317461" y="32">
 2
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 121.98809523809524 36)" x="121.98809523809524" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 142.6547619047619 32)" x="142.6547619047619" y="32">
 3
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 134.5674603174603 36)" x="134.5674603174603" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 157.45634920634922 32)" x="157.45634920634922" y="32">
 4
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 147.1468253968254 36)" x="147.1468253968254" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 172.2579365079365 32)" x="172.2579365079365" y="32">
 5
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 159.72619047619048 36)" x="159.72619047619048" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 187.0595238095238 32)" x="187.0595238095238" y="32">
 6
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 168.5 36)" x="168.5" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 196.5 32)" x="196.5" y="32">
 0
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 181.0793650793651 36)" x="181.0793650793651" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 211.3015873015873 32)" x="211.3015873015873" y="32">
 1
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 193.65873015873015 36)" x="193.65873015873015" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 226.1031746031746 32)" x="226.1031746031746" y="32">
 2
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 206.23809523809524 36)" x="206.23809523809524" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 240.9047619047619 32)" x="240.9047619047619" y="32">
 3
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 218.8174603174603 36)" x="218.8174603174603" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 255.70634920634922 32)" x="255.70634920634922" y="32">
 4
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 231.3968253968254 36)" x="231.3968253968254" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 270.5079365079365 32)" x="270.5079365079365" y="32">
 5
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 243.97619047619048 36)" x="243.97619047619048" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 285.3095238095238 32)" x="285.3095238095238" y="32">
 6
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 252.75 36)" x="252.75" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 294.75 32)" x="294.75" y="32">
 0
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 265.32936507936506 36)" x="265.32936507936506" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 309.5515873015873 32)" x="309.5515873015873" y="32">
 1
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 277.9087301587302 36)" x="277.9087301587302" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 324.3531746031746 32)" x="324.3531746031746" y="32">
 2
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 290.48809523809524 36)" x="290.48809523809524" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 339.1547619047619 32)" x="339.1547619047619" y="32">
 3
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 303.0674603174603 36)" x="303.0674603174603" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 353.9563492063492 32)" x="353.9563492063492" y="32">
 4
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 315.6468253968254 36)" x="315.6468253968254" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 368.7579365079365 32)" x="368.7579365079365" y="32">
 5
 </text>
-<text dominant-baseline="middle" text-anchor="right" transform="rotate(90 328.2261904761905 36)" x="328.2261904761905" y="36">
+<text dominant-baseline="middle" text-anchor="end" transform="rotate(90 383.5595238095238 32)" x="383.5595238095238" y="32">
 6
 </text>
-<line stroke="black" x1="0" x2="0" y1="46" y2="56"/>
-<line stroke="black" x1="12.579365079365079" x2="12.579365079365079" y1="46" y2="56"/>
-<line stroke="black" x1="25.158730158730158" x2="25.158730158730158" y1="46" y2="56"/>
-<line stroke="black" x1="37.73809523809524" x2="37.73809523809524" y1="46" y2="56"/>
-<line stroke="black" x1="50.317460317460316" x2="50.317460317460316" y1="46" y2="56"/>
-<line stroke="black" x1="62.8968253968254" x2="62.8968253968254" y1="46" y2="56"/>
-<line stroke="black" x1="75.47619047619048" x2="75.47619047619048" y1="46" y2="56"/>
-<line stroke="black" x1="84.25" x2="84.25" y1="46" y2="56"/>
-<line stroke="black" x1="96.82936507936508" x2="96.82936507936508" y1="46" y2="56"/>
-<line stroke="black" x1="109.40873015873015" x2="109.40873015873015" y1="46" y2="56"/>
-<line stroke="black" x1="121.98809523809524" x2="121.98809523809524" y1="46" y2="56"/>
-<line stroke="black" x1="134.5674603174603" x2="134.5674603174603" y1="46" y2="56"/>
-<line stroke="black" x1="147.1468253968254" x2="147.1468253968254" y1="46" y2="56"/>
-<line stroke="black" x1="159.72619047619048" x2="159.72619047619048" y1="46" y2="56"/>
-<line stroke="black" x1="168.5" x2="168.5" y1="46" y2="56"/>
-<line stroke="black" x1="181.0793650793651" x2="181.0793650793651" y1="46" y2="56"/>
-<line stroke="black" x1="193.65873015873015" x2="193.65873015873015" y1="46" y2="56"/>
-<line stroke="black" x1="206.23809523809524" x2="206.23809523809524" y1="46" y2="56"/>
-<line stroke="black" x1="218.8174603174603" x2="218.8174603174603" y1="46" y2="56"/>
-<line stroke="black" x1="231.3968253968254" x2="231.3968253968254" y1="46" y2="56"/>
-<line stroke="black" x1="243.97619047619048" x2="243.97619047619048" y1="46" y2="56"/>
-<line stroke="black" x1="252.75" x2="252.75" y1="46" y2="56"/>
-<line stroke="black" x1="265.32936507936506" x2="265.32936507936506" y1="46" y2="56"/>
-<line stroke="black" x1="277.9087301587302" x2="277.9087301587302" y1="46" y2="56"/>
-<line stroke="black" x1="290.48809523809524" x2="290.48809523809524" y1="46" y2="56"/>
-<line stroke="black" x1="303.0674603174603" x2="303.0674603174603" y1="46" y2="56"/>
-<line stroke="black" x1="315.6468253968254" x2="315.6468253968254" y1="46" y2="56"/>
-<line stroke="black" x1="328.2261904761905" x2="328.2261904761905" y1="46" y2="56"/>
+<line stroke="black" x1="0" x2="0" y1="32" y2="42"/>
+<line stroke="black" x1="14.8015873015873" x2="14.8015873015873" y1="32" y2="42"/>
+<line stroke="black" x1="29.6031746031746" x2="29.6031746031746" y1="32" y2="42"/>
+<line stroke="black" x1="44.404761904761905" x2="44.404761904761905" y1="32" y2="42"/>
+<line stroke="black" x1="59.2063492063492" x2="59.2063492063492" y1="32" y2="42"/>
+<line stroke="black" x1="74.00793650793652" x2="74.00793650793652" y1="32" y2="42"/>
+<line stroke="black" x1="88.80952380952381" x2="88.80952380952381" y1="32" y2="42"/>
+<line stroke="black" x1="98.25" x2="98.25" y1="32" y2="42"/>
+<line stroke="black" x1="113.0515873015873" x2="113.0515873015873" y1="32" y2="42"/>
+<line stroke="black" x1="127.85317460317461" x2="127.85317460317461" y1="32" y2="42"/>
+<line stroke="black" x1="142.6547619047619" x2="142.6547619047619" y1="32" y2="42"/>
+<line stroke="black" x1="157.45634920634922" x2="157.45634920634922" y1="32" y2="42"/>
+<line stroke="black" x1="172.2579365079365" x2="172.2579365079365" y1="32" y2="42"/>
+<line stroke="black" x1="187.0595238095238" x2="187.0595238095238" y1="32" y2="42"/>
+<line stroke="black" x1="196.5" x2="196.5" y1="32" y2="42"/>
+<line stroke="black" x1="211.3015873015873" x2="211.3015873015873" y1="32" y2="42"/>
+<line stroke="black" x1="226.1031746031746" x2="226.1031746031746" y1="32" y2="42"/>
+<line stroke="black" x1="240.9047619047619" x2="240.9047619047619" y1="32" y2="42"/>
+<line stroke="black" x1="255.70634920634922" x2="255.70634920634922" y1="32" y2="42"/>
+<line stroke="black" x1="270.5079365079365" x2="270.5079365079365" y1="32" y2="42"/>
+<line stroke="black" x1="285.3095238095238" x2="285.3095238095238" y1="32" y2="42"/>
+<line stroke="black" x1="294.75" x2="294.75" y1="32" y2="42"/>
+<line stroke="black" x1="309.5515873015873" x2="309.5515873015873" y1="32" y2="42"/>
+<line stroke="black" x1="324.3531746031746" x2="324.3531746031746" y1="32" y2="42"/>
+<line stroke="black" x1="339.1547619047619" x2="339.1547619047619" y1="32" y2="42"/>
+<line stroke="black" x1="353.9563492063492" x2="353.9563492063492" y1="32" y2="42"/>
+<line stroke="black" x1="368.7579365079365" x2="368.7579365079365" y1="32" y2="42"/>
+<line stroke="black" x1="383.5595238095238" x2="383.5595238095238" y1="32" y2="42"/>
 </g>
 <g c:description="Y axis facets on right side of graph" transform="rotate(90 618.75 51) translate(618.75 51)">
-<text dominant-baseline="hanging" text-anchor="middle" x="166" y="0">
+<text dominant-baseline="hanging" text-anchor="middle" x="194" y="0">
 Variable 12
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="39.625" y="23">
+<text dominant-baseline="hanging" text-anchor="middle" x="46.625" y="23">
 V12-4
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="123.875" y="23">
+<text dominant-baseline="hanging" text-anchor="middle" x="144.875" y="23">
 V12-5
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="208.125" y="23">
+<text dominant-baseline="hanging" text-anchor="middle" x="243.125" y="23">
 V12-6
 </text>
-<text dominant-baseline="hanging" text-anchor="middle" x="292.375" y="23">
+<text dominant-baseline="hanging" text-anchor="middle" x="341.375" y="23">
 V12-7
 </text>
 </g>