output-item: Make command name part of every output_item.

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

diff --git a/src/output/table-item.h b/src/output/table-item.h
index dddf846ca952a08ea0709ffc72f737b9654da175..be0987659684ef68fdeba2f23e9d80d9e0506074 100644 (file)
--- a/src/output/table-item.h
+++ b/src/output/table-item.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011, 2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,11 +20,14 @@
 /* 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 caption). */
+   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"
 
 /* A table item.
 
@@ -32,17 +35,13 @@
    of the accessor functions defined below. */
 struct table_item
   {
-    struct output_item output_item; /* Superclass. */
-    struct table *table;        /* The table to be rendered. */
-    char *caption;              /* May be null if there is no caption. */
-  };
-
-struct table_item *table_item_create (struct table *, const char *caption);
+    struct output_item output_item;   /* Superclass. */
+    struct pivot_table *pt;           /* The table to be rendered. */
 
-const struct table *table_item_get_table (const struct table_item *);
+    char *cached_label;
+  };
 
-const char *table_item_get_caption (const struct table_item *);
-void table_item_set_caption (struct table_item *, const char *);
+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. */
@@ -99,5 +98,5 @@ table_item_is_shared (const struct table_item *instance)
 }
 
 void table_item_submit (struct table_item *);
-\f
+
 #endif /* output/table-item.h */