X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable-provider.h;h=f87293721f47846d0153d89f5ea1fa430894a164;hb=9574a6c2bf65ddc8ef13d4e942833bc5d4b0d2e0;hp=27bf5f47bca3c89cd4454fad1eb7ba0e38d5cac9;hpb=b4953e577f4b83b16f3329e7ff22d60950f3b0d5;p=pspp

diff --git a/src/output/table-provider.h b/src/output/table-provider.h
index 27bf5f47bc..f87293721f 100644
--- 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 area_style *style;
-  };
-
 /* A cell in a table. */
 struct table_cell
   {
@@ -54,18 +46,11 @@ struct table_cell
     int d[TABLE_N_AXES][2];
 
     unsigned int options;       /* TAB_*. */
-    char *text;                 /* A paragraph of text. */
-
-    /* Optional footnote(s). */
-    const struct footnote **footnotes;
-    size_t n_footnotes;
-
-    const struct area_style *style;
+    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
@@ -90,61 +75,10 @@ table_cell_is_joined (const struct table_cell *cell)
   return table_cell_colspan (cell) > 1 || table_cell_rowspan (cell) > 1;
 }
 
-/* Declarations to allow defining table classes. */
-
-struct table_class
-  {
-    /* Frees TABLE.
-
-       The table class may assume that any cells that were retrieved by calling
-       the 'get_cell' function have been freed (by calling their destructors)
-       before this function is called. */
-    void (*destroy) (struct table *table);
-
-    /* Initializes CELL with the contents of the table cell at column X and row
-       Y within TABLE.  All members of CELL must be initialized, except that if
-       'destructor' is set to a null pointer, then 'destructor_aux' need not be
-       initialized.  The 'contents' member of CELL must be set to a nonnull
-       value.
-
-       The table class must allow any number of cells in the table to be
-       retrieved simultaneously; that is, TABLE must not assume that a given
-       cell will be freed before another one is retrieved using 'get_cell'.
-
-       The table class must allow joined cells to be retrieved, with identical
-       contents, using any (X,Y) location inside the cell.
-
-       The table class must not allow cells to overlap.
-
-       The table class should not allow a joined cell to cross the border
-       between header rows/columns and the interior of the table.  That is, a
-       joined cell should be entirely within headers rows and columns or
-       entirely outside them.
-
-       The table class may assume that CELL will be freed before TABLE is
-       destroyed. */
-    void (*get_cell) (const struct table *table, int x, int y,
-                      struct table_cell *cell);
-
-    /* Returns one of the TAL_* enumeration constants (declared in
-       output/table.h) representing a rule running alongside one of the cells
-       in TABLE.
-
-       See table_get_rule() in table.c for a detailed explanation of the
-       meaning of AXIS and X and Y, including a diagram. */
-    int (*get_rule) (const struct table *table,
-                     enum table_axis axis, int x, int y,
-                     struct cell_color *color);
-  };
-
-void table_init (struct table *, const struct table_class *, int nc, int nr);
-
 /* 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 ***);
 
 #endif /* output/table-provider.h */