work

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

diff --git a/src/output/table-item.h b/src/output/table-item.h
index b7866a3c9b565f95fe996d62d562c604aab4d14e..8d62421ea18ccda2290101d73dc914da68d3fcb5 100644 (file)
--- a/src/output/table-item.h
+++ b/src/output/table-item.h
@@ -20,59 +20,19 @@
 /* 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
-   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). */
+   contains a pivot table (see pivot-table.h). */
 
 #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;
-    size_t n_footnotes;
-    struct 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 *);
-
-/* A table item.
-
-   The members of struct table_item should not be accessed directly.  Use one
-   of the accessor functions defined below. */
+/* A table item. */
 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 pivot_table *table;       /* The table to be rendered. */
   };
 
-struct table_item *table_item_create (struct table *, const char *title,
-                                      const char *caption);
-
-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_item_text *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_text *table_item_get_caption (
-  const struct table_item *);
-void table_item_set_caption (struct table_item *,
-                             const struct table_item_text *);
+struct table_item *table_item_create (struct pivot_table *);
 \f
 /* This boilerplate for table_item, a subclass of output_item, was
    autogenerated by mk-class-boilerplate. */