X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable.h;h=add7bf94bee3da0bad444c9b3880682d6587ffda;hb=588d9107cd4b6eee3a0c3ece3cf53868e22c52f4;hp=5075fa9e40fc85b122e75da580944d69ac858767;hpb=464a7a97da808da1d8a608e9254dfaad30c9de72;p=pspp diff --git a/src/output/table.h b/src/output/table.h index 5075fa9e40..add7bf94be 100644 --- a/src/output/table.h +++ b/src/output/table.h @@ -19,16 +19,16 @@ /* Tables. -. A table is a rectangular grid of cells. Cells can be joined to form larger + A table is a rectangular grid of cells. Cells can be joined to form larger cells. Rows and columns can be separated by rules of various types. Rows at the top and bottom of a table and columns at the left and right edges of a table can be designated as headers, which means that if the table must be broken across more than one page, those rows or columns are repeated on each page. - A table is not itself an output_item, and thus a table cannot by itself be - used for output, but they can be embedded inside struct table_item (see - table-item.h) for that purpose. */ + Some drivers use tables as an implementation detail of rendering pivot + tables. +*/ #include #include @@ -37,6 +37,8 @@ struct casereader; struct fmt_spec; +struct pivot_footnote; +struct pivot_value; struct pool; struct table_item; struct variable; @@ -86,6 +88,15 @@ enum table_stroke const char *table_stroke_to_string (enum table_stroke); +/* Given strokes A and B, returns a stroke that "combines" them, that is, that + gives a reasonable stroke choice for a rule for different reasons should + have both styles A and B. */ +static inline int +table_stroke_combine (enum table_stroke a, enum table_stroke b) +{ + return a > b ? a : b; +} + struct table_border_style { enum table_stroke stroke; @@ -135,7 +146,7 @@ struct font_style bool bold, italic, underline, markup; struct cell_color fg[2], bg[2]; char *typeface; - int size; + int size; /* In 1/72" units. */ }; #define FONT_STYLE_INITIALIZER { FONT_STYLE_INITIALIZER__ } @@ -143,77 +154,43 @@ struct font_style .fg = { [0] = CELL_COLOR_BLACK, [1] = CELL_COLOR_BLACK}, \ .bg = { [0] = CELL_COLOR_WHITE, [1] = CELL_COLOR_WHITE}, -void font_style_copy (struct font_style *, const struct font_style *); +void font_style_copy (struct pool *, + struct font_style *, const struct font_style *); void font_style_uninit (struct font_style *); void font_style_dump (const struct font_style *); +bool font_style_equal (const struct font_style *, const struct font_style *); -struct area_style +struct table_area_style { struct cell_style cell_style; struct font_style font_style; }; -#define AREA_STYLE_INITIALIZER { AREA_STYLE_INITIALIZER__ } -#define AREA_STYLE_INITIALIZER__ \ +#define TABLE_AREA_STYLE_INITIALIZER { TABLE_AREA_STYLE_INITIALIZER__ } +#define TABLE_AREA_STYLE_INITIALIZER__ \ .cell_style = CELL_STYLE_INITIALIZER, \ .font_style = FONT_STYLE_INITIALIZER -struct area_style *area_style_clone (struct pool *, const struct area_style *); -void area_style_copy (struct area_style *, const struct area_style *); -void area_style_uninit (struct area_style *); -void area_style_free (struct area_style *); +struct table_area_style *table_area_style_clone ( + struct pool *, const struct table_area_style *); +void table_area_style_copy (struct pool *, struct table_area_style *, + const struct table_area_style *); +void table_area_style_uninit (struct table_area_style *); +void table_area_style_free (struct table_area_style *); /* Properties of a table cell. */ enum { TAB_NONE = 0, - TAB_FIX = 1 << 1, /* Use fixed font. */ - TAB_MARKUP = 1 << 2, /* Text contains Pango markup. */ - TAB_NUMERIC = 1 << 3, /* Cell contents are numeric. */ TAB_ROTATE = 1 << 4, /* Rotate cell contents 90 degrees. */ TAB_STYLE_SHIFT = 5, TAB_STYLE_MASK = 7 << TAB_STYLE_SHIFT, - /* Horizontal alignment of cell contents. */ - TAB_RIGHT = 0 << 10, - TAB_LEFT = 1 << 10, - TAB_CENTER = 2 << 10, - TAB_HALIGN = 3 << 10, /* Alignment mask. */ - - /* Vertical alignment of cell contents. */ - TAB_TOP = 0 << 12, - TAB_MIDDLE = 1 << 12, - TAB_BOTTOM = 2 << 12, - TAB_VALIGN = 3 << 12, /* Alignment mask. */ - /* Internal use by tab.c only. */ TAB_JOIN = 1 << 14, }; -/* Styles for the rules around table cells. */ -enum - { - TAL_NONE = TABLE_STROKE_NONE, -#define TAL_0 TAL_NONE - TAL_SOLID = TABLE_STROKE_SOLID, -#define TAL_1 TAL_SOLID - TAL_DASHED = TABLE_STROKE_DASHED, - TAL_THICK = TABLE_STROKE_THICK, - TAL_THIN = TABLE_STROKE_THIN, - TAL_DOUBLE = TABLE_STROKE_DOUBLE, -#define TAL_2 TAL_DOUBLE - }; - -/* Given line styles A and B (each one of the TAL_* enumeration constants - above), returns a line style that "combines" them, that is, that gives a - reasonable line style choice for a rule for different reasons should have - both styles A and B. */ -static inline int table_rule_combine (int a, int b) -{ - return a > b ? a : b; -} - /* A table. */ struct table { @@ -245,13 +222,13 @@ struct table /* Table contents. - Each array element in cc[] is ordinarily a "char *" pointer to a - string. If TAB_JOIN (defined in tab.c) is set in ct[] for the element, + Each array element in cc[] is ordinarily a "struct pivot_value *". + If TAB_JOIN (defined in table.c) is set in ct[] for the element, however, it is a joined cell and the corresponding element of cc[] - points to a struct tab_joined_cell. */ + points to a struct table_cell. */ void **cc; /* Cell contents; void *[nr][nc]. */ unsigned short *ct; /* Cell types; unsigned short[nr][nc]. */ - struct area_style *styles[8]; + struct table_area_style *styles[8]; /* Rules. */ unsigned char *rh; /* Horiz rules; unsigned char[nr+1][nc]. */ @@ -264,29 +241,6 @@ struct table *table_ref (const struct table *); void table_unref (struct table *); bool table_is_shared (const struct table *); -/* Returns the number of columns or rows, respectively, in T. */ -static inline int table_nc (const struct table *t) - { return t->n[TABLE_HORZ]; } -static inline int table_nr (const struct table *t) - { return t->n[TABLE_VERT]; } - -/* Returns the number of left, right, top, or bottom headers, respectively, in - T. */ -static inline int table_hl (const struct table *t) - { return t->h[TABLE_HORZ][0]; } -static inline int table_hr (const struct table *t) - { return t->h[TABLE_HORZ][1]; } -static inline int table_ht (const struct table *t) - { return t->h[TABLE_VERT][0]; } -static inline int table_hb (const struct table *t) - { return t->h[TABLE_VERT][1]; } - -/* Simple kinds of output. */ -struct table *table_from_string (const char *); -void table_output_text (int options, const char *string); -void table_output_text_format (int options, const char *, ...) - PRINTF_FORMAT (2, 3); - /* Rule masks. */ #define TAB_RULE_TYPE_MASK 7 #define TAB_RULE_TYPE_SHIFT 0 @@ -303,23 +257,10 @@ void table_box (struct table *, int f_h, int f_v, int i_h, int i_v, int x1, int y1, int x2, int y2); /* Cells. */ -void table_text (struct table *, int c, int r, unsigned opt, const char *); -void table_text_format (struct table *, int c, int r, unsigned opt, - const char *, ...) - PRINTF_FORMAT (5, 6); - -void table_joint_text (struct table *, int x1, int y1, int x2, int y2, - unsigned opt, const char *); - -struct footnote *table_create_footnote (struct table *, size_t idx, - const char *content, - const char *marker, - struct area_style *); -void table_add_footnote (struct table *, int x, int y, - const struct footnote *); - -void table_add_style (struct table *, int x, int y, - const struct area_style *); +void table_put (struct table *, int x1, int y1, int x2, int y2, + unsigned opt, const struct pivot_value *); +void table_put_owned (struct table *, int x1, int y1, int x2, int y2, + unsigned opt, struct pivot_value *); bool table_cell_is_empty (const struct table *, int c, int r);