output: Expand footnote support.

[pspp] / src / output / tab.h

diff --git a/src/output/tab.h b/src/output/tab.h
index 9371d812c652292de4fb8e64032665be96a12ab6..00d8fab93cacc2cee3fe97db959cb092796c6d05 100644 (file)
--- a/src/output/tab.h
+++ b/src/output/tab.h
@@ -143,13 +143,10 @@ void tab_joint_text_format (struct tab_table *, int x1, int y1, int x2, int y2,
                             unsigned opt, const char *, ...)
      PRINTF_FORMAT (7, 8);
 
-void tab_footnote (struct tab_table *, int x, int y, const char *format, ...)
-  PRINTF_FORMAT (4, 5);
-
-void tab_subtable (struct tab_table *, int x1, int y1, int x2, int y2,
-                   unsigned opt, struct table_item *subtable);
-void tab_subtable_bare (struct tab_table *, int x1, int y1, int x2, int y2,
-                        unsigned opt, struct table_item *subtable);
+struct footnote *tab_create_footnote (struct tab_table *, size_t idx,
+                                      const char *content, const char *marker);
+void tab_add_footnote (struct tab_table *, int x, int y,
+                       const struct footnote *);
 
 bool tab_cell_is_empty (const struct tab_table *, int c, int r);