it works again

[pspp] / src / output / table.h

diff --git a/src/output/table.h b/src/output/table.h
index edd617e8e1c673d15f2d8884f5a5a9bd246dd979..ed9badf5d15aa9c4d2449825b54bf84b5fb26331 100644 (file)
--- a/src/output/table.h
+++ b/src/output/table.h
@@ -19,7 +19,7 @@
 
 /* Tables.
 
 
 /* Tables.
 

-.  A table is a rectangular grid of cells.  Cells can be joined to form larger
+   A table is a rectangular grid of cells.  Cells can be joined to form larger

    cells.  Rows and columns can be separated by rules of various types.  Rows
    at the top and bottom of a table and columns at the left and right edges of
    a table can be designated as headers, which means that if the table must be
    cells.  Rows and columns can be separated by rules of various types.  Rows
    at the top and bottom of a table and columns at the left and right edges of
    a table can be designated as headers, which means that if the table must be


@@ -37,6 +37,7 @@
 
 struct casereader;
 struct fmt_spec;
 
 struct casereader;
 struct fmt_spec;

+struct pivot_footnote;

 struct pool;
 struct table_item;
 struct variable;
 struct pool;
 struct table_item;
 struct variable;


@@ -156,6 +157,7 @@ void font_style_copy (struct pool *,
                       struct font_style *, const struct font_style *);
 void font_style_uninit (struct font_style *);
 void font_style_dump (const struct font_style *);
                       struct font_style *, const struct font_style *);
 void font_style_uninit (struct font_style *);
 void font_style_dump (const struct font_style *);

+bool font_style_equal (const struct font_style *, const struct font_style *);

 
 struct table_area_style
   {
 
 struct table_area_style
   {


@@ -266,23 +268,11 @@ void table_joint_text (struct table *, int x1, int y1, int x2, int y2,
 
 void table_add_subscripts (struct table *, int x, int y,
                            char **subscripts, size_t n_subscripts);
 
 void table_add_subscripts (struct table *, int x, int y,
                            char **subscripts, size_t n_subscripts);

-void table_add_superscript (struct table *, int x, int y,
-                            const char *superscript);
-
-/* Footnotes.
-
-   Use table_create_footnote() to create the footnotes themselves, then use
-   table_add_footnote() to create a reference from a table cell to a footnote.
-   There are two steps because a footnote may have multiple references. */
-struct footnote *table_create_footnote (struct table *, size_t idx,
-                                        const char *content,
-                                        const char *marker,
-                                        struct table_area_style *);
-void table_add_footnote (struct table *, int x, int y,
-                         const struct footnote *);
-
-void table_add_style (struct table *, int x, int y,
-                      const struct table_area_style *);
+
+void table_add_footnotes (struct table *, int x, int y,
+                          struct pivot_footnote **f, size_t nf);
+
+void table_add_style (struct table *, int x, int y, struct table_area_style *);

 
 bool table_cell_is_empty (const struct table *, int c, int r);
 
 
 bool table_cell_is_empty (const struct table *, int c, int r);