X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable-item.h;h=57d18b75cc28c26c32e0d2c5580fbe372111998d;hb=d950831f83004457e69c3e6e44131aef3e57efd3;hp=15f5c568f37b15350363dc40a0fd29692575f2e1;hpb=5b5099296b3c7212623991de8920e1459e234922;p=pspp

diff --git a/src/output/table-item.h b/src/output/table-item.h
index 15f5c568f3..57d18b75cc 100644
--- a/src/output/table-item.h
+++ b/src/output/table-item.h
@@ -20,11 +20,49 @@
 /* Table items.
 
    A table item is a subclass of an output item (see output-item.h) that
-   contains a table (see table.h) and some formatting properties (currently
-   just a title). */
+   contains a table (see table.h) and some formatting properties.  Currently
+   the formatting properties are an optional title (a brief description
+   typically displayed above the table) and an optional caption (a more verbose
+   description typically displayed below the table). */
 
 #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;
+    struct footnote **footnotes;
+    size_t n_footnotes;
+    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.
 
@@ -32,17 +70,34 @@
    of the accessor functions defined below. */
 struct table_item
   {
-    struct output_item output_item; /* Superclass. */
-    struct table *table;        /* The table to be rendered. */
-    char *title;                /* May be null if there is no title. */
+    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);
+struct table_item *table_item_create (struct table *);
 
 const struct table *table_item_get_table (const struct table_item *);
 
-const char *table_item_get_title (const struct table_item *);
-void table_item_set_title (struct table_item *, const char *);
+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_layers *table_item_get_layers (
+  const struct table_item *);
+void table_item_set_layers (struct table_item *,
+                           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);
 
 /* This boilerplate for table_item, a subclass of output_item, was
    autogenerated by mk-class-boilerplate. */