LIST: Remove WEIGHT subcommand.

[pspp-builds.git] / src / output / manager.h

diff --git a/src/output/manager.h b/src/output/manager.h
index 76763ae6682139dfd86f1594ebab97a042d631e7..e7276982fc5c5a064b89cc8e0af364d43283a38f 100644 (file)
--- a/src/output/manager.h
+++ b/src/output/manager.h
@@ -37,8 +37,7 @@
 
 enum som_type
   {
-    SOM_TABLE,
-    SOM_CHART
+    SOM_TABLE
   } ;
 
 /* Entity (Table or Chart) . */
@@ -47,8 +46,14 @@ struct som_entity
     const struct som_table_class *class;       /* Table class. */
     enum som_type type;                 /* Table or Chart */
     void *ext;                         /* Owned by table or chart class. */
+    int table_num;                      /* Table number. */
+    int subtable_num;                   /* Sub-table number. */
+    char *command_name;                 /* Command that yielded this output. */
   };
 
+struct som_entity *som_entity_clone (struct som_entity *);
+void som_entity_destroy (struct som_entity *);
+
 /* Group styles. */
 enum
   {
@@ -90,16 +95,14 @@ struct som_table_class
     void (*area) (void *, int *horiz, int *vert);
     void (*cumulate) (void *, int cumtype, int start, int *end,
                       int max, int *actual);
-    void (*title) (void *, int x, int y);
+    void (*title) (void *, int x, int y, int table_num, int subtable_num,
+                   const char *command_name);
     void (*render) (void *, int x1, int y1, int x2, int y2);
   };
 
-/* Table indexes. */
-extern int table_num;
-extern int subtable_num;
-
 /* Submission. */
 void som_new_series (void);
+void som_set_command_name (const char *);
 void som_submit (struct som_entity *t);
 
 /* Miscellaneous. */