Fix layers rendering.

diff --git a/rust/pspp/src/output/drivers/cairo/fsm.rs b/rust/pspp/src/output/drivers/cairo/fsm.rs
index 165e304c1170d296486647202b016df26d9c7f5f..05075ca1f00691a4b602c656120e056f0ff4fb2d 100644 (file)
--- a/rust/pspp/src/output/drivers/cairo/fsm.rs
+++ b/rust/pspp/src/output/drivers/cairo/fsm.rs
@@ -137,7 +137,7 @@ impl CairoFsm {
             context,
         };
         let item = if let Some(text) = item.details.as_text() {
-            Arc::new(Item::new(PivotTable::from(dbg!(text).clone())))
+            Arc::new(Item::new(PivotTable::from(text.clone())))
         } else {
             item
         };

diff --git a/rust/pspp/src/output/pivot/output.rs b/rust/pspp/src/output/pivot/output.rs
index 00e1e714577e59fb32627b10ff0f0248b6cdbeac..5a457d4f18abefd41eb50d1d3518ab21e34e7b6b 100644 (file)
--- a/rust/pspp/src/output/pivot/output.rs
+++ b/rust/pspp/src/output/pivot/output.rs
@@ -292,7 +292,14 @@ impl PivotTable {
             layer_indexes,
         ) {
             if !dimension.is_empty() {
-                layers.push(dimension.nth_leaf(layer_index).unwrap().0.clone());
+                // `\u{2001}` is an "em quad" space, which looks to me like the
+                // space that SPSS uses here.
+                let s = format!(
+                    "{}:\u{2001}{}",
+                    dimension.root.name().display(self),
+                    dimension.nth_leaf(layer_index).unwrap().0.display(self)
+                );
+                layers.push(Box::new(Value::new_user_text(s)));
             }
         }
         layers.reverse();