work on monolithic output and outer borders

[pspp] / src / output / cairo-fsm.c

diff --git a/src/output/cairo-fsm.c b/src/output/cairo-fsm.c
index 51f48efb750d087d110930de8c14ec149ecf7eaf..9f7b71af7e8830e87069ad7b7a60c6172da0e908 100644 (file)
--- a/src/output/cairo-fsm.c
+++ b/src/output/cairo-fsm.c
@@ -407,6 +407,12 @@ static void
 xrr_measure_cell_width (void *xr_, const struct table_cell *cell,
                         int *min_width, int *max_width)
 {
+  if (cell->options & TABLE_CELL_PADDING)
+    {
+      *min_width = *max_width = XR_LINE_WIDTH;
+      return;
+    }
+
   struct xr_fsm *xr = xr_;
   int bb[TABLE_N_AXES][2];
   int clip[TABLE_N_AXES][2];
@@ -432,6 +438,9 @@ xrr_measure_cell_width (void *xr_, const struct table_cell *cell,
 static int
 xrr_measure_cell_height (void *xr_, const struct table_cell *cell, int width)
 {
+  if (cell->options & TABLE_CELL_PADDING)
+    return XR_LINE_WIDTH;
+
   struct xr_fsm *xr = xr_;
 
   const int (*margin)[2] = cell->cell_style->margin;