output: Add debugging code to rendering and table code.

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

diff --git a/src/output/table-provider.h b/src/output/table-provider.h
index be45912d92148994b3484404cdb8d3e626497a58..a3d1fab78f0381ac0996fcc489d91e624f6adea3 100644 (file)
--- a/src/output/table-provider.h
+++ b/src/output/table-provider.h
@@ -25,14 +25,6 @@ struct string;
 
 enum table_halign table_halign_interpret (enum table_halign, bool numeric);
 
-struct footnote
-  {
-    size_t idx;
-    char *content;
-    char *marker;
-    struct table_area_style *style;
-  };
-
 /* A cell in a table. */
 struct table_cell
   {
@@ -53,19 +45,12 @@ struct table_cell
        or both. */
     int d[TABLE_N_AXES][2];
 
-    unsigned int options;       /* TAB_*. */
-    char *text;                 /* A paragraph of text. */
-    char **subscripts;
-    size_t n_subscripts;
-    char *superscript;
-    const struct footnote **footnotes;
-    size_t n_footnotes;
-    const struct table_area_style *style;
+    unsigned char options;       /* TABLE_CELL_*. */
+    const struct pivot_value *value;
+    const struct font_style *font_style;
+    const struct cell_style *cell_style;
   };
 
-void table_cell_format_footnote_markers (const struct table_cell *,
-                                         struct string *);
-
 /* Returns the number of columns that CELL spans.  This is 1 for an ordinary
    cell and greater than one for a cell that joins multiple columns. */
 static inline int
@@ -93,9 +78,7 @@ table_cell_is_joined (const struct table_cell *cell)
 /* For use primarily by output drivers. */
 
 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 ***);
+struct table_border_style table_get_rule (const struct table *,
+                                          enum table_axis, int x, int y);
 
 #endif /* output/table-provider.h */