output: Add support for alternating row colors.

[pspp] / src / output / table-provider.h

diff --git a/src/output/table-provider.h b/src/output/table-provider.h
index ae7f77d420b40cf7fa364cf2c87431f0c119c7cd..1d21cdfd5c374a140270c4742a899f6187482cfc 100644 (file)
--- a/src/output/table-provider.h
+++ b/src/output/table-provider.h
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include "output/table.h"
 
+struct pool;
 struct string;
 
 struct footnote
@@ -27,6 +28,7 @@ struct footnote
     size_t idx;
     char *content;
     char *marker;
+    struct cell_style *style;
   };
 
 /* An item of contents within a table cell. */
@@ -60,7 +62,7 @@ cell_color_equal (const struct cell_color *a, const struct cell_color *b)
 
 struct cell_style
   {
-    struct cell_color fg, bg;
+    struct cell_color fg[2], bg[2];
     int margin[TABLE_N_AXES][2];
     char *font;
     int font_size;
@@ -69,8 +71,8 @@ struct cell_style
 
 #define CELL_STYLE_INITIALIZER                                  \
     {                                                           \
-      .fg = CELL_COLOR_BLACK,                                   \
-      .bg = CELL_COLOR_WHITE,                                   \
+      .fg = { [0] = CELL_COLOR_BLACK, [1] = CELL_COLOR_BLACK},  \
+      .bg = { [0] = CELL_COLOR_WHITE, [1] = CELL_COLOR_WHITE},  \
       .margin = { [TABLE_HORZ][0] = 8, [TABLE_HORZ][1] = 11,    \
                   [TABLE_VERT][0] = 1, [TABLE_VERT][1] = 1 },   \
       .font = NULL,                                             \
@@ -80,7 +82,7 @@ struct cell_style
       .underline = false,                                       \
     }
 
-struct cell_style *cell_style_clone (const struct cell_style *);
+struct cell_style *cell_style_clone (struct pool *, const struct cell_style *);
 void cell_style_free (struct cell_style *);
 
 /* A cell in a table. */
@@ -192,7 +194,8 @@ struct table_class
        See table_get_rule() in table.c for a detailed explanation of the
        meaning of AXIS and X and Y, including a diagram. */
     int (*get_rule) (const struct table *table,
-                     enum table_axis axis, int x, int y);
+                     enum table_axis axis, int x, int y,
+                     struct cell_color *color);
 
     /* This function is optional and most table classes will not implement it.
 
@@ -248,7 +251,8 @@ void table_set_nr (struct table *, int nr);
 /* For use primarily by output drivers. */
 
 void table_get_cell (const struct table *, int x, int y, struct table_cell *);
-int table_get_rule (const struct table *, enum table_axis, int x, int y);
+int table_get_rule (const struct table *, enum table_axis, int x, int y,
+                    struct cell_color *);
 size_t table_collect_footnotes (const struct table_item *,
                                 const struct footnote ***);