more work toward making table_item just a pivot_Table

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

diff --git a/src/output/table-provider.h b/src/output/table-provider.h
index 8cac97a6d9b8363e2c0c56bdd14be60397db76af..30dcdff75f26dfd604b67f94a1428d608d17ed1a 100644 (file)
--- a/src/output/table-provider.h
+++ b/src/output/table-provider.h
@@ -27,12 +27,15 @@ enum table_halign table_halign_interpret (enum table_halign, bool numeric);
 
 struct footnote
   {
-    size_t idx;
+    //size_t idx;
     char *content;
     char *marker;
     struct table_area_style *style;
   };
 
+struct footnote *footnote_clone (const struct footnote *);
+void footnote_destroy (struct footnote *);
+
 /* A cell in a table. */
 struct table_cell
   {
@@ -57,11 +60,14 @@ struct table_cell
     char *text;                 /* A paragraph of text. */
     char **subscripts;
     size_t n_subscripts;
-    const struct footnote **footnotes;
+    struct footnote **footnotes;
     size_t n_footnotes;
-    const struct table_area_style *style;
+    struct table_area_style *style;
   };
 
+struct table_cell *table_cell_clone (const struct table_cell *);
+void table_cell_destroy (struct table_cell *);
+
 void table_cell_format_footnote_markers (const struct table_cell *,
                                          struct string *);
 
@@ -94,7 +100,6 @@ table_cell_is_joined (const struct table_cell *cell)
 void table_get_cell (const struct table *, int x, int y, struct table_cell *);
 int table_get_rule (const struct table *, enum table_axis, int x, int y,
                     struct cell_color *);
-size_t table_collect_footnotes (const struct table_item *,
-                                const struct footnote ***);
+size_t table_collect_footnotes (const struct table_item *, struct footnote ***);
 
 #endif /* output/table-provider.h */