output: Make global variables less global.

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

diff --git a/src/output/manager.h b/src/output/manager.h
index 76763ae6682139dfd86f1594ebab97a042d631e7..1aa2c36aae86e60a04360a23affe559a9b65f180 100644 (file)
--- a/src/output/manager.h
+++ b/src/output/manager.h
@@ -47,6 +47,8 @@ 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. */
   };
 
 /* Group styles. */
@@ -90,14 +92,10 @@ 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);
     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_submit (struct som_entity *t);