table: Simplify interface for number of rows and columns.

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

diff --git a/src/output/table-provider.h b/src/output/table-provider.h
index ab39b4b25c5fc7d1e848726a98b1e457ca0feda2..27bf5f47bca3c89cd4454fad1eb7ba0e38d5cac9 100644 (file)
--- a/src/output/table-provider.h
+++ b/src/output/table-provider.h
@@ -23,54 +23,16 @@
 struct pool;
 struct string;
 
+enum table_halign table_halign_interpret (enum table_halign, bool numeric);
+
 struct footnote
   {
     size_t idx;
     char *content;
     char *marker;
-    struct cell_style *style;
-  };
-
-struct cell_color
-  {
-    uint8_t r, g, b;
-  };
-
-#define CELL_COLOR(r, g, b) (struct cell_color) { r, g, b }
-#define CELL_COLOR_BLACK CELL_COLOR (0, 0, 0)
-#define CELL_COLOR_WHITE CELL_COLOR (255, 255, 255)
-
-static inline bool
-cell_color_equal (const struct cell_color *a, const struct cell_color *b)
-{
-  return a->r == b->r && a->g == b->g && a->b == b->b;
-}
-
-struct cell_style
-  {
-    struct cell_color fg[2], bg[2];
-    int margin[TABLE_N_AXES][2];
-    char *typeface;
-    int size;
-    bool bold, italic, underline;
+    struct area_style *style;
   };
 
-#define CELL_STYLE_INITIALIZER                                  \
-    {                                                           \
-      .fg = { [0] = CELL_COLOR_BLACK, [1] = CELL_COLOR_BLACK},  \
-      .bg = { [0] = CELL_COLOR_WHITE, [1] = CELL_COLOR_WHITE},  \
-      .margin = { [TABLE_HORZ][0] = 8, [TABLE_HORZ][1] = 11,    \
-                  [TABLE_VERT][0] = 1, [TABLE_VERT][1] = 1 },   \
-      .typeface = NULL,                                         \
-      .size = 0,                                                \
-      .bold = false,                                            \
-      .italic = false,                                          \
-      .underline = false,                                       \
-    }
-
-struct cell_style *cell_style_clone (struct pool *, const struct cell_style *);
-void cell_style_free (struct cell_style *);
-
 /* A cell in a table. */
 struct table_cell
   {
@@ -98,15 +60,9 @@ struct table_cell
     const struct footnote **footnotes;
     size_t n_footnotes;
 
-    const struct cell_style *style;
-
-    /* Called to free the cell's data, if nonnull. */
-    void (*destructor) (void *destructor_aux);
-    void *destructor_aux;
+    const struct area_style *style;
   };
 
-void table_cell_free (struct table_cell *);
-
 void table_cell_format_footnote_markers (const struct table_cell *,
                                          struct string *);
 
@@ -179,57 +135,9 @@ struct table_class
     int (*get_rule) (const struct table *table,
                      enum table_axis axis, int x, int y,
                      struct cell_color *color);
-
-    /* This function is optional and most table classes will not implement it.
-
-       If provided, this function must take ownership of A and B and return a
-       table that consists of tables A and B "pasted together", that is, a
-       table whose size is the sum of the sizes of A and B along the axis
-       specified by ORIENTATION.  A and B will ordinarily have the same size
-       along the axis opposite ORIENTATION; no particular handling of tables
-       that have different sizes along that axis is required.
-
-       The handling of rules at the seam between A and B is not specified, but
-       table_rule_combine() is one reasonable way to do it.
-
-       Called only if neither A and B is shared (as returned by
-       table_is_shared()).
-
-       Called if A or B or both is of the class defined by this table class.
-       That is, the implementation must be prepared to deal with the case where
-       A or B is not the ordinarily expected table class.
-
-       This function may return a null pointer if it cannot implement the paste
-       operation, in which case the caller will use a fallback
-       implementation.
-
-       This function is used to implement table_paste(). */
-    struct table *(*paste) (struct table *a, struct table *b,
-                            enum table_axis orientation);
-
-    /* This function is optional and most table classes will not implement it.
-
-       If provided, this function must take ownership of TABLE and return a new
-       table whose contents are the TABLE's rows RECT[TABLE_VERT][0] through
-       RECT[TABLE_VERT][1], exclusive, and the TABLE's columns
-       RECT[TABLE_HORZ][0] through RECT[TABLE_HORZ][1].
-
-       Called only if TABLE is not shared (as returned by table_is_shared()).
-
-       This function may return a null pointer if it cannot implement the
-       select operation, in which case the caller will use a fallback
-       implementation.
-
-       This function is used to implement table_select(). */
-    struct table *(*select) (struct table *table, int rect[TABLE_N_AXES][2]);
   };
 
-void table_init (struct table *, const struct table_class *);
-
-/* Table class implementations can call these functions or just set the
-   table's n[] and h[][] members directly. */
-void table_set_nc (struct table *, int nc);
-void table_set_nr (struct table *, int nr);
+void table_init (struct table *, const struct table_class *, int nc, int nr);
 \f
 /* For use primarily by output drivers. */