X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable-provider.h;h=8cac97a6d9b8363e2c0c56bdd14be60397db76af;hb=e8a8e5b226a84910ccfd13ddb66c438107724b60;hp=ef1f6ea5b916da933f179bf8e3178f856a9129e8;hpb=a7a300e7d9963ce9a26fd87e4db922ed74111731;p=pspp diff --git a/src/output/table-provider.h b/src/output/table-provider.h index ef1f6ea5b9..8cac97a6d9 100644 --- a/src/output/table-provider.h +++ b/src/output/table-provider.h @@ -30,7 +30,7 @@ struct footnote size_t idx; char *content; char *marker; - struct area_style *style; + struct table_area_style *style; }; /* A cell in a table. */ @@ -55,20 +55,13 @@ struct table_cell unsigned int options; /* TAB_*. */ char *text; /* A paragraph of text. */ - - /* Optional footnote(s). */ + char **subscripts; + size_t n_subscripts; const struct footnote **footnotes; size_t n_footnotes; - - const struct area_style *style; - - /* Called to free the cell's data, if nonnull. */ - void (*destructor) (void *destructor_aux); - void *destructor_aux; + const struct table_area_style *style; }; -void table_cell_free (struct table_cell *); - void table_cell_format_footnote_markers (const struct table_cell *, struct string *); @@ -96,103 +89,6 @@ 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); - - /* 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); - /* For use primarily by output drivers. */ void table_get_cell (const struct table *, int x, int y, struct table_cell *);