From 4dba8c0de56e07aa4d21538fba7ad3c40df01004 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 20 Apr 2025 18:48:46 -0700
Subject: [PATCH] Break up cairo module.

---
 .../src/output/{cairo.rs => cairo/fsm.rs}     | 106 +++---------------
 rust/pspp/src/output/cairo/mod.rs             |  94 ++++++++++++++++
 2 files changed, 110 insertions(+), 90 deletions(-)
 rename rust/pspp/src/output/{cairo.rs => cairo/fsm.rs} (90%)
 create mode 100644 rust/pspp/src/output/cairo/mod.rs

diff --git a/rust/pspp/src/output/cairo.rs b/rust/pspp/src/output/cairo/fsm.rs
similarity index 90%
rename from rust/pspp/src/output/cairo.rs
rename to rust/pspp/src/output/cairo/fsm.rs
index b6cdeb922f..d4d12d9fa9 100644
--- a/rust/pspp/src/output/cairo.rs
+++ b/rust/pspp/src/output/cairo/fsm.rs
@@ -1,8 +1,6 @@
-use std::{
-    borrow::Cow, cmp::min, f64::consts::PI, fmt::Write, ops::DerefMut, path::Path, sync::Arc,
-};
+use std::{cmp::min, f64::consts::PI, fmt::Write, ops::DerefMut, sync::Arc};
 
-use cairo::{Context, PdfSurface, Surface};
+use cairo::{Context, Surface};
 use enum_map::{enum_map, EnumMap};
 use itertools::Itertools;
 use pango::{
@@ -12,16 +10,9 @@ use pango::{
 use pangocairo::functions::show_layout;
 use smallvec::{smallvec, SmallVec};
 
-use crate::output::{
-    driver::Driver,
-    page::Setup,
-    pivot::{Color, Coord2, FontStyle, HorzAlign, Stroke},
-    render::{Device, DrawCell, Extreme, Params},
-    table::Content,
-    Item,
-};
-
-use super::pivot::{Axis2, BorderStyle, Rect2};
+use crate::output::pivot::{Axis2, BorderStyle, Coord2, FontStyle, HorzAlign, Rect2, Stroke};
+use crate::output::render::{Device, DrawCell, Extreme, Params};
+use crate::output::{pivot::Color, table::Content};
 
 /// Width of an ordinary line.
 const LINE_WIDTH: usize = LINE_SPACE / 2;
@@ -47,7 +38,7 @@ fn pxf_to_xr(x: f64) -> usize {
     (x * (SCALE as f64 * 72.0 / 96.0)).round() as usize
 }
 
-pub struct Style {
+pub struct CairoFsmStyle {
     /// Page size.
     pub size: Coord2,
 
@@ -76,7 +67,7 @@ pub struct Style {
     pub font_resolution: f64,
 }
 
-impl Style {
+impl CairoFsmStyle {
     fn new_layout(&self, context: &Context) -> Layout {
         let pangocairo_context = pangocairo::functions::create_context(context);
         pangocairo::functions::context_set_resolution(&pangocairo_context, self.font_resolution);
@@ -84,14 +75,14 @@ impl Style {
     }
 }
 
-pub struct CairoRenderer {
-    style: Arc<Style>,
+pub struct CairoFsm {
+    style: Arc<CairoFsmStyle>,
     params: Params,
     context: Context,
 }
 
-impl CairoRenderer {
-    pub fn new(style: Arc<Style>, printing: bool, surface: &Surface) -> Self {
+impl CairoFsm {
+    pub fn new(style: Arc<CairoFsmStyle>, printing: bool, surface: &Surface) -> Self {
         let context = Context::new(surface).unwrap();
         let params = Params {
             size: style.size,
@@ -126,9 +117,11 @@ impl CairoRenderer {
             context,
         }
     }
+
+    //pub fn render(&mut self, table: &PivotTable) {}
 }
 
-fn parse_font_style(font_style: &FontStyle) -> FontDescription {
+pub fn parse_font_style(font_style: &FontStyle) -> FontDescription {
     let font = font_style.font.as_str();
     let font = if font.eq_ignore_ascii_case("Monospaced") {
         "Monospace"
@@ -188,7 +181,7 @@ fn avoid_decimal_split(mut s: String) -> String {
     s
 }
 
-impl CairoRenderer {
+impl CairoFsm {
     fn layout_cell(&self, cell: &DrawCell, mut bb: Rect2, clip: &Rect2) -> Coord2 {
         // XXX rotation
         //let h = if cell.rotate { Axis2::Y } else { Axis2::X };
@@ -425,7 +418,7 @@ fn margin(cell: &DrawCell, axis: Axis2) -> usize {
     )
 }
 
-impl Device for CairoRenderer {
+impl Device for CairoFsm {
     fn params(&self) -> &Params {
         &self.params
     }
@@ -674,70 +667,3 @@ impl Device for CairoRenderer {
         self.context.scale(factor, factor);
     }
 }
-
-pub struct CairoDriver {
-    renderer: CairoRenderer,
-}
-
-impl CairoDriver {
-    pub fn new(path: impl AsRef<Path>) -> CairoDriver {
-        fn scale(inches: f64) -> usize {
-            (inches * 72.0 * SCALE as f64).max(0.0).round() as usize
-        }
-
-        let page_setup = Setup::default();
-        let printable = page_setup.printable_size();
-        let size = Coord2::new(scale(printable[Axis2::X]), scale(printable[Axis2::Y]));
-        let font = FontStyle {
-            bold: false,
-            italic: false,
-            underline: false,
-            markup: false,
-            font: "Sans Serif".into(),
-            fg: [Color::BLACK, Color::BLACK],
-            bg: [Color::WHITE, Color::WHITE],
-            size: 10,
-        };
-        let font = parse_font_style(&font);
-        let style = Style {
-            size,
-            min_break: enum_map! {
-                Axis2::X => size[Axis2::X] / 2,
-                Axis2::Y => size[Axis2::Y] / 2,
-            },
-            font,
-            fg: Color::BLACK,
-            use_system_colors: false,
-            object_spacing: scale(page_setup.object_spacing),
-            font_resolution: 72.0,
-        };
-        let surface = PdfSurface::new(
-            page_setup.paper[Axis2::X] * 72.0,
-            page_setup.paper[Axis2::Y] * 72.0,
-            path,
-        )
-        .unwrap();
-        let renderer = CairoRenderer::new(Arc::new(style), false, &surface);
-        Self { renderer }
-    }
-}
-
-impl Driver for CairoDriver {
-    fn name(&self) -> Cow<'static, str> {
-        todo!()
-    }
-
-    fn write(&mut self, item: &Arc<Item>) {
-        todo!()
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::output::cairo::CairoDriver;
-
-    #[test]
-    fn create() {
-        CairoDriver::new("test.pdf");
-    }
-}
diff --git a/rust/pspp/src/output/cairo/mod.rs b/rust/pspp/src/output/cairo/mod.rs
new file mode 100644
index 0000000000..5649ca9a68
--- /dev/null
+++ b/rust/pspp/src/output/cairo/mod.rs
@@ -0,0 +1,94 @@
+use std::{borrow::Cow, path::Path, sync::Arc};
+
+use cairo::PdfSurface;
+use enum_map::enum_map;
+use pango::SCALE;
+
+use crate::output::{
+    cairo::fsm::{parse_font_style, CairoFsm, CairoFsmStyle},
+    driver::Driver,
+    page::Setup,
+    pivot::{Color, Coord2, FontStyle},
+    Item,
+};
+
+use super::pivot::Axis2;
+
+pub mod fsm;
+
+pub struct CairoDriver {
+    renderer: CairoFsm,
+}
+
+impl CairoDriver {
+    pub fn new(path: impl AsRef<Path>) -> CairoDriver {
+        fn scale(inches: f64) -> usize {
+            (inches * 72.0 * SCALE as f64).max(0.0).round() as usize
+        }
+
+        let page_setup = Setup::default();
+        let printable = page_setup.printable_size();
+        let size = Coord2::new(scale(printable[Axis2::X]), scale(printable[Axis2::Y]));
+        let font = FontStyle {
+            bold: false,
+            italic: false,
+            underline: false,
+            markup: false,
+            font: "Sans Serif".into(),
+            fg: [Color::BLACK, Color::BLACK],
+            bg: [Color::WHITE, Color::WHITE],
+            size: 10,
+        };
+        let font = parse_font_style(&font);
+        let style = CairoFsmStyle {
+            size,
+            min_break: enum_map! {
+                Axis2::X => size[Axis2::X] / 2,
+                Axis2::Y => size[Axis2::Y] / 2,
+            },
+            font,
+            fg: Color::BLACK,
+            use_system_colors: false,
+            object_spacing: scale(page_setup.object_spacing),
+            font_resolution: 72.0,
+        };
+        let surface = PdfSurface::new(
+            page_setup.paper[Axis2::X] * 72.0,
+            page_setup.paper[Axis2::Y] * 72.0,
+            path,
+        )
+        .unwrap();
+        let renderer = CairoFsm::new(Arc::new(style), false, &surface);
+        Self { renderer }
+    }
+}
+
+impl Driver for CairoDriver {
+    fn name(&self) -> Cow<'static, str> {
+        Cow::from("cairo")
+    }
+
+    fn write(&mut self, item: &Arc<Item>) {
+        match &item.details {
+            super::Details::Chart => todo!(),
+            super::Details::Image => todo!(),
+            super::Details::Group(_vec) => todo!(),
+            super::Details::Message(_diagnostic) => todo!(),
+            super::Details::PageBreak => todo!(),
+            super::Details::Table(_pivot_table) => {
+                todo!()
+            }
+            super::Details::Text(_text) => todo!(),
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::output::cairo::CairoDriver;
+
+    #[test]
+    fn create() {
+        CairoDriver::new("test.pdf");
+    }
+}
-- 
2.30.2