printing works; font sizes are weird

[pspp] / src / output / cairo-pager.h

diff --git a/src/output/cairo-pager.h b/src/output/cairo-pager.h
index b0cdfdf9144e4ce84c91db657a943230dbea7318..ab843ee30e6973d1585f303622253640d27e5526 100644 (file)
--- a/src/output/cairo-pager.h
+++ b/src/output/cairo-pager.h
@@ -33,14 +33,11 @@ struct xr_page_style
   {
     int ref_cnt;
 
-    int size[TABLE_N_AXES];          /* Page size minus margins. */
     int margins[TABLE_N_AXES][2];    /* Margins. */
 
     struct page_heading headings[2]; /* Top and bottom headings. */
-    PangoFontDescription *font;
 
     struct cell_color bg;            /* Background color. */
-    double font_scale;
     int initial_page_number;
     int object_spacing;
   };
@@ -52,9 +49,10 @@ bool xr_page_style_equals (const struct xr_page_style *,
 struct xr_page_style *xr_page_style_default (void);
 
 static inline int
-xr_page_style_paper_size (const struct xr_page_style *ps, enum table_axis a)
+xr_page_style_paper_size (const struct xr_page_style *ps,
+                          const struct xr_fsm_style *fs, enum table_axis a)
 {
-  return ps->size[a] + ps->margins[a][0] + ps->margins[a][1];
+  return fs->size[a] + ps->margins[a][0] + ps->margins[a][1];
 }
 
 struct xr_pager *xr_pager_create (const struct xr_page_style *,
@@ -62,8 +60,7 @@ struct xr_pager *xr_pager_create (const struct xr_page_style *,
 void xr_pager_destroy (struct xr_pager *);
 
 bool xr_pager_has_item (const struct xr_pager *);
-void xr_pager_add_item (struct xr_pager *, const struct xr_fsm_style *,
-                        const struct output_item *);
+void xr_pager_add_item (struct xr_pager *, const struct output_item *);
 
 bool xr_pager_has_page (const struct xr_pager *);
 void xr_pager_add_page (struct xr_pager *, cairo_t *);