X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable-provider.h;h=27bf5f47bca3c89cd4454fad1eb7ba0e38d5cac9;hb=b4953e577f4b83b16f3329e7ff22d60950f3b0d5;hp=0e22989b996bcfa9700c88d7cdce2a4ae5f0c7ba;hpb=311f2cd4115da767c61c548aa25e71e722ec937c;p=pspp diff --git a/src/output/table-provider.h b/src/output/table-provider.h index 0e22989b99..27bf5f47bc 100644 --- a/src/output/table-provider.h +++ b/src/output/table-provider.h @@ -20,48 +20,17 @@ #include #include "output/table.h" +struct pool; struct string; +enum table_halign table_halign_interpret (enum table_halign, bool numeric); + struct footnote { size_t idx; char *content; char *marker; - }; - -/* An item of contents within a table cell. */ -struct cell_contents - { - unsigned int options; /* TAB_*. */ - char *text; /* A paragraph of text. */ - - /* Optional footnote(s). */ - const struct footnote **footnotes; - size_t n_footnotes; - }; - -void cell_contents_format_footnote_markers (const struct cell_contents *, - struct string *); - -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, bg; - int margin[TABLE_N_AXES][2]; + struct area_style *style; }; /* A cell in a table. */ @@ -84,27 +53,18 @@ struct table_cell or both. */ int d[TABLE_N_AXES][2]; - /* The cell's contents. - - Most table cells contain only one item (a paragraph of text), but cells - are allowed to be empty (n_contents == 0) or contain a nested table, or - multiple items. - - 'inline_contents' provides a place to store a single item to handle the - common case. - */ - const struct cell_contents *contents; - size_t n_contents; - struct cell_contents inline_contents; + unsigned int options; /* TAB_*. */ + char *text; /* A paragraph of text. */ - const struct cell_style *style; + /* Optional footnote(s). */ + const struct footnote **footnotes; + size_t n_footnotes; - /* 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 *); /* 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. */ @@ -173,63 +133,17 @@ struct table_class 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); - - /* 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]); + enum table_axis axis, int x, int y, + struct cell_color *color); }; -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); /* 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); +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 ***);