output-item: Make label a part of every output_item.

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

diff --git a/src/output/cairo-fsm.c b/src/output/cairo-fsm.c
index c485eb7225bd0a64f580d4fb73232477304265b2..1241dbd77a1141129e0754556614ea40ce60a353 100644 (file)
--- a/src/output/cairo-fsm.c
+++ b/src/output/cairo-fsm.c
@@ -514,6 +514,13 @@ xrr_adjust_break (void *xr_, const struct table_cell *cell,
   xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk);
   return brk;
 }
+
+static void
+xrr_scale (void *xr_, double scale)
+{
+  struct xr_fsm *xr = xr_;
+  cairo_scale (xr->cairo, scale, scale);
+}
 \f
 static void
 xr_clip (struct xr_fsm *xr, int clip[TABLE_N_AXES][2])
@@ -981,7 +988,8 @@ xr_fsm_create (const struct output_item *item_,
       item = table_item_super (
         text_item_to_table_item (
           text_item_create (TEXT_ITEM_TITLE,
-                            to_group_open_item (item_)->command_name)));
+                            to_group_open_item (item_)->command_name,
+                            NULL)));
     }
   else
     NOT_REACHED ();
@@ -995,6 +1003,7 @@ xr_fsm_create (const struct output_item *item_,
     .adjust_break = xrr_adjust_break,
     .draw_line = xrr_draw_line,
     .draw_cell = xrr_draw_cell,
+    .scale = xrr_scale,
   };
 
   enum { LW = XR_LINE_WIDTH, LS = XR_LINE_SPACE };