output: Expand footnote support.

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

diff --git a/src/output/table-provider.h b/src/output/table-provider.h
index b64410c22703b33f7f4b98bc49a624f016d0dfbc..a511e13bd5c95439dc0504b91abb64f414e7aedf 100644 (file)
--- a/src/output/table-provider.h
+++ b/src/output/table-provider.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997, 1998, 1999, 2000, 2009, 2011, 2013, 2014 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2009, 2011, 2013, 2014, 2018 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
@@ -19,20 +19,29 @@
 
 #include "output/table.h"
 
+struct string;
+
+struct footnote
+  {
+    size_t idx;
+    char *content;
+    char *marker;
+  };
+
 /* An item of contents within a table cell. */
 struct cell_contents
   {
     unsigned int options;       /* TAB_*. */
-
-    /* Exactly one of these must be nonnull. */
     char *text;                 /* A paragraph of text. */
-    struct table_item *table;   /* A table nested within the cell. */
 
     /* Optional footnote(s). */
-    char **footnotes;
+    const struct footnote **footnotes;
     size_t n_footnotes;
   };
 
+void cell_contents_format_footnote_markers (const struct cell_contents *,
+                                            struct string *);
+
 /* A cell in a table. */
 struct table_cell
   {
@@ -197,5 +206,7 @@ void table_set_nr (struct table *, int nr);
 
 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);
+size_t table_collect_footnotes (const struct table_item *,
+                                const struct footnote ***);
 
 #endif /* output/table-provider.h */