table: Rename area_style to table_area_style for consistency.

[pspp] / src / output / cairo.c

diff --git a/src/output/cairo.c b/src/output/cairo.c
index b733c941fd103711d26bb690262ed408cf0be839..2bfa3228a17a7c1eaaf61cb7ef8b696a91427b5d 100644 (file)
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -193,7 +193,7 @@ static void xr_measure_cell_width (void *, const struct table_cell *,
 static int xr_measure_cell_height (void *, const struct table_cell *,
                                    int width);
 static void xr_draw_cell (void *, const struct table_cell *, int color_idx,
-                          int bb[TABLE_N_AXES][2],
+                          int bb[TABLE_N_AXES][2], int valign_offset,
                           int spill[TABLE_N_AXES][2],
                           int clip[TABLE_N_AXES][2]);
 static int xr_adjust_break (void *, const struct table_cell *,
@@ -1358,7 +1358,7 @@ static void xr_clip (struct xr_driver *, int clip[TABLE_N_AXES][2]);
 
 static void
 xr_draw_cell (void *xr_, const struct table_cell *cell, int color_idx,
-              int bb[TABLE_N_AXES][2],
+              int bb[TABLE_N_AXES][2], int valign_offset,
               int spill[TABLE_N_AXES][2],
               int clip[TABLE_N_AXES][2])
 {
@@ -1392,6 +1392,8 @@ xr_draw_cell (void *xr_, const struct table_cell *cell, int color_idx,
   if (!xr->systemcolors)
     set_source_rgba (xr->cairo, &cell->style->font_style.fg[color_idx]);
 
+  bb[V][0] += valign_offset;
+
   for (int axis = 0; axis < TABLE_N_AXES; axis++)
     {
       bb[axis][0] += px_to_xr (cell->style->cell_style.margin[axis][0]);