table-item: Change title from table_item_text to table_cell.

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

diff --git a/src/output/table-item.h b/src/output/table-item.h
index ffdc4b682c204ce8dc2be9e729f6fb438cc2640b..57d18b75cc28c26c32e0d2c5580fbe372111998d 100644 (file)
--- a/src/output/table-item.h
+++ b/src/output/table-item.h
@@ -27,52 +27,77 @@
 
 #include "libpspp/compiler.h"
 #include "output/output-item.h"
+#include "output/table.h"
 
 /* Title or caption in a table item. */
 struct table_item_text
   {
     char *content;
-    const struct footnote **footnotes;
+    struct footnote **footnotes;
     size_t n_footnotes;
-    int halign;                 /* TAB_*. */
-    struct cell_style *style;
+    struct table_area_style *style;
   };
 
 struct table_item_text *table_item_text_create (const char *);
 struct table_item_text *table_item_text_clone (const struct table_item_text *);
 void table_item_text_destroy (struct table_item_text *);
 
+struct table_item_layer
+  {
+    char *content;
+    struct footnote **footnotes;
+    size_t n_footnotes;
+  };
+
+void table_item_layer_copy (struct table_item_layer *,
+                            const struct table_item_layer *);
+void table_item_layer_uninit (struct table_item_layer *);
+
+struct table_item_layers
+  {
+    struct table_item_layer *layers;
+    size_t n_layers;
+    struct table_area_style *style;
+  };
+
+struct table_item_layers *table_item_layers_clone (
+  const struct table_item_layers *);
+void table_item_layers_destroy (struct table_item_layers *);
+
 /* A table item.
 
    The members of struct table_item should not be accessed directly.  Use one
    of the accessor functions defined below. */
 struct table_item
   {
-    struct output_item output_item;  /* Superclass. */
-    struct table *table;             /* The table to be rendered. */
-    struct table_item_text *title;   /* Null if there is no title. */
-    struct table_item_text *layers;  /* Null if there is no layer info. */
-    struct table_item_text *caption; /* Null if there is no caption. */
+    struct output_item output_item;   /* Superclass. */
+    struct table *table;              /* The table to be rendered. */
+    struct table_cell *title;         /* Null if there is no title. */
+    struct table_item_text *caption;  /* Null if there is no caption. */
+    struct table_item_layers *layers; /* Null if there is no layer info. */
+    char *notes;                      /* Shown as tooltip. */
+    struct pivot_table *pt;
   };
 
-struct table_item *table_item_create (struct table *, const char *title,
-                                      const char *caption);
+struct table_item *table_item_create (struct table *);
 
 const struct table *table_item_get_table (const struct table_item *);
 
-const struct table_item_text *table_item_get_title (const struct table_item *);
-void table_item_set_title (struct table_item *,
-                           const struct table_item_text *);
+const struct table_cell *table_item_get_title (const struct table_item *);
+void table_item_set_title (struct table_item *, const struct table_cell *);
 
-const struct table_item_text *table_item_get_layers (
+const struct table_item_layers *table_item_get_layers (
   const struct table_item *);
 void table_item_set_layers (struct table_item *,
-                           const struct table_item_text *);
+                           const struct table_item_layers *);
 
 const struct table_item_text *table_item_get_caption (
   const struct table_item *);
 void table_item_set_caption (struct table_item *,
                              const struct table_item_text *);
+
+const char *table_item_get_notes (const struct table_item *);
+void table_item_set_notes (struct table_item *, const char *notes);
 \f
 /* This boilerplate for table_item, a subclass of output_item, was
    autogenerated by mk-class-boilerplate. */