table: Make table cells have exactly one piece of content again.

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

diff --git a/src/output/table-provider.h b/src/output/table-provider.h
index d875462c9c237b7c00f3f8f3e88b32666da55a17..14c3656e4a2958b02c5dcf27e03138919f4a312a 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,22 +28,9 @@ struct footnote
     size_t idx;
     char *content;
     char *marker;
+    struct cell_style *style;
   };
 
-/* An item of contents within a table cell. */
-struct cell_contents
-  {
-    unsigned int options;       /* TAB_*. */
-    char *text;                 /* A paragraph of text. */
-
-    /* Optional footnote(s). */
-    const struct footnote **footnotes;
-    size_t n_footnotes;
-  };
-
-void cell_contents_format_footnote_markers (const struct cell_contents *,
-                                            struct string *);
-
 struct cell_color
   {
     uint8_t r, g, b;
@@ -60,7 +48,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 +57,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 +68,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. */
@@ -103,18 +91,12 @@ struct table_cell
        or both. */
     int d[TABLE_N_AXES][2];
 
-    /* The cell's contents.
-
-       Most table cells contain only one item (a paragraph of text), but cells
-       are allowed to be empty (n_contents == 0) or contain a nested table, or
-       multiple items.
+    unsigned int options;       /* TAB_*. */
+    char *text;                 /* A paragraph of text. */
 
-       'inline_contents' provides a place to store a single item to handle the
-       common case.
-    */
-    const struct cell_contents *contents;
-    size_t n_contents;
-    struct cell_contents inline_contents;
+    /* Optional footnote(s). */
+    const struct footnote **footnotes;
+    size_t n_footnotes;
 
     const struct cell_style *style;
 
@@ -125,6 +107,9 @@ struct table_cell
 
 void table_cell_free (struct table_cell *);
 
+void table_cell_format_footnote_markers (const struct table_cell *,
+                                         struct string *);
+
 /* Returns the number of columns that CELL spans.  This is 1 for an ordinary
    cell and greater than one for a cell that joins multiple columns. */
 static inline int