X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Foutput%2Ftable.h;h=1fe78d8e767ab2e69bd636a643cfb3737d76b439;hb=df1d194af32e35739355981252785e768f21ebb0;hp=f4fbc786f0440ea39da04ebfa0c54070ccec7cd1;hpb=8b71948cd57dbd2787cb4c50525b957e9be8a62b;p=pspp
diff --git a/src/output/table.h b/src/output/table.h
index f4fbc786f0..1fe78d8e76 100644
--- a/src/output/table.h
+++ b/src/output/table.h
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000, 2009, 2013, 2014 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -14,188 +14,243 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-#if !tab_h
-#define tab_h 1
+#ifndef OUTPUT_TABLE_H
+#define OUTPUT_TABLE_H 1
-#include
-#include
+/* Tables.
-/* Cell options. */
-enum
- {
- TAB_NONE = 0,
+ 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.
+
+ Some drivers use tables as an implementation detail of rendering pivot
+ tables.
+*/
+
+#include
+#include
+#include
+#include "libpspp/compiler.h"
+
+struct casereader;
+struct fmt_spec;
+struct pivot_footnote;
+struct pivot_value;
+struct pool;
+struct table_item;
+struct variable;
- TAB_ALIGN_MASK = 03, /* Alignment mask. */
- TAB_RIGHT = 00, /* Right justify. */
- TAB_LEFT = 01, /* Left justify. */
- TAB_CENTER = 02, /* Center. */
+/* A table axis.
- /* Cell types. */
- TAB_JOIN = 004, /* Joined cell. */
- TAB_EMPTY = 010, /* Empty cell. */
+ Many table-related declarations use 2-element arrays in place of "x" and "y"
+ variables. This reduces code duplication significantly, because much table
+ code treats rows and columns the same way.
- /* Flags. */
- TAB_EMPH = 020, /* Emphasize cell contents. */
- TAB_FIX = 040, /* Use fixed font. */
+ A lot of code that uses these enumerations assumes that the two values are 0
+ and 1, so don't change them to other values. */
+enum table_axis
+ {
+ TABLE_HORZ,
+ TABLE_VERT
+#define TABLE_N_AXES 2
};
-/* Line styles. */
-enum
+struct cell_color
{
- TAL_0 = 0, /* No line. */
- TAL_1 = 1, /* Single line. */
- TAL_2 = 2, /* Double line. */
- TAL_GAP = 3, /* Spacing but no line. */
- TAL_COUNT, /* Number of line styles. */
+ uint8_t alpha, r, g, b;
};
-/* Column styles. Must correspond to SOM_COL_*. */
-enum
+#define CELL_COLOR(r, g, b) { 255, 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.alpha == b.alpha && a.r == b.r && a.g == b.g && a.b == b.b;
+}
+
+void cell_color_dump (const struct cell_color *);
+
+enum table_stroke
{
- TAB_COL_NONE, /* No columns. */
- TAB_COL_DOWN /* Columns down first. */
+ TABLE_STROKE_NONE = 0, /* Must be zero. */
+ TABLE_STROKE_SOLID,
+ TABLE_STROKE_DASHED,
+ TABLE_STROKE_THICK,
+ TABLE_STROKE_THIN,
+ TABLE_STROKE_DOUBLE,
+ TABLE_N_STROKES,
};
-/* Joined cell. */
-struct tab_joined_cell
+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
{
- int x1, y1;
- int x2, y2;
- struct substring contents;
+ enum table_stroke stroke;
+ struct cell_color color;
};
-struct outp_driver;
-struct tab_table;
-struct tab_rendering;
+#define TABLE_BORDER_STYLE_INITIALIZER { TABLE_STROKE_SOLID, CELL_COLOR_BLACK }
+
+enum table_halign
+ {
+ TABLE_HALIGN_RIGHT,
+ TABLE_HALIGN_LEFT,
+ TABLE_HALIGN_CENTER,
+ TABLE_HALIGN_MIXED,
+ TABLE_HALIGN_DECIMAL
+ };
-typedef void tab_dim_func (struct tab_rendering *, void *aux);
-typedef void tab_dim_free_func (void *aux);
+const char *table_halign_to_string (enum table_halign);
-/* A table. */
-struct tab_table
+enum table_valign
{
- struct pool *container;
- int ref_cnt; /* Reference count. */
-
- /* Contents. */
- int col_style; /* Columns: One of TAB_COL_*. */
- char *title; /* Table title. */
- unsigned flags; /* SOMF_*. */
- int nc, nr; /* Number of columns, rows. */
- int cf; /* Column factor for indexing purposes. */
- int l, r, t, b; /* Number of header rows on each side. */
- struct substring *cc; /* Cell contents; substring *[nr][nc]. */
- unsigned char *ct; /* Cell types; unsigned char[nr][nc]. */
- unsigned char *rh; /* Horiz rules; unsigned char[nr+1][nc]. */
- unsigned char *rv; /* Vert rules; unsigned char[nr][nc+1]. */
+ TABLE_VALIGN_TOP,
+ TABLE_VALIGN_CENTER,
+ TABLE_VALIGN_BOTTOM,
+ };
- /* Calculating row and column dimensions. */
- tab_dim_func *dim; /* Calculates cell widths and heights. */
- tab_dim_free_func *dim_free; /* Frees space allocated for dim function. */
- void *dim_aux; /* Auxiliary data for dim function. */
+const char *table_valign_to_string (enum table_valign);
- /* Editing info. */
- int col_ofs, row_ofs; /* X and Y offsets. */
+struct cell_style
+ {
+ enum table_halign halign;
+ enum table_valign valign;
+ double decimal_offset; /* In 1/96" units. */
+ char decimal_char; /* Either '.' or ','. */
+ int margin[TABLE_N_AXES][2]; /* In 1/96" units. */
};
-/* Number of rows or columns in TABLE. */
-static inline int tab_nr (const struct tab_table *table) { return table->nr; }
-static inline int tab_nc (const struct tab_table *table) { return table->nc; }
+#define CELL_STYLE_INITIALIZER { CELL_STYLE_INITIALIZER__ }
+#define CELL_STYLE_INITIALIZER__ \
+ .margin = { [TABLE_HORZ][0] = 8, [TABLE_HORZ][1] = 11, \
+ [TABLE_VERT][0] = 1, [TABLE_VERT][1] = 1 }
-/* Number of left/right/top/bottom header columns/rows in TABLE. */
-static inline int tab_l (const struct tab_table *table) { return table->l; }
-static inline int tab_r (const struct tab_table *table) { return table->r; }
-static inline int tab_t (const struct tab_table *table) { return table->t; }
-static inline int tab_b (const struct tab_table *table) { return table->b; }
+void cell_style_dump (const struct cell_style *);
-struct tab_rendering
+struct font_style
{
- const struct tab_table *table;
- struct outp_driver *driver;
-
- int *w; /* Column widths; [nc]. */
- int *h; /* Row heights; [nr]. */
- int *hrh; /* Heights of horizontal rules; [nr+1]. */
- int *wrv; /* Widths of vertical rules; [nc+1]. */
-
- /* These fields would be redundant with those in struct tab_table, except
- that a table will be rendered with fewer header rows or columns than
- requested when we are pressed for space. */
- int l, r, t, b; /* Number of header rows/columns. */
- int wl, wr, ht, hb; /* Width/height of header rows/columns. */
+ bool bold, italic, underline, markup;
+ struct cell_color fg[2], bg[2];
+ char *typeface;
+ int size; /* In 1/72" units. */
};
-/* Tables. */
-struct tab_table *tab_create (int nc, int nr);
-void tab_destroy (struct tab_table *);
-void tab_ref (struct tab_table *);
-void tab_resize (struct tab_table *, int nc, int nr);
-void tab_realloc (struct tab_table *, int nc, int nr);
-void tab_headers (struct tab_table *, int l, int r, int t, int b);
-void tab_columns (struct tab_table *, int style);
-void tab_title (struct tab_table *, const char *, ...)
- PRINTF_FORMAT (2, 3);
-void tab_flags (struct tab_table *, unsigned);
-void tab_submit (struct tab_table *);
-
-/* Dimensioning. */
-tab_dim_func tab_natural_dimensions;
-int tab_natural_width (const struct tab_rendering *, int c);
-int tab_natural_height (const struct tab_rendering *, int r);
-void tab_dim (struct tab_table *,
- tab_dim_func *, tab_dim_free_func *, void *aux);
+#define FONT_STYLE_INITIALIZER { FONT_STYLE_INITIALIZER__ }
+#define FONT_STYLE_INITIALIZER__ \
+ .fg = { [0] = CELL_COLOR_BLACK, [1] = CELL_COLOR_BLACK}, \
+ .bg = { [0] = CELL_COLOR_WHITE, [1] = CELL_COLOR_WHITE},
-/* Rules. */
-void tab_hline (struct tab_table *, int style, int x1, int x2, int y);
-void tab_vline (struct tab_table *, int style, int x, int y1, int y2);
-void tab_box (struct tab_table *, int f_h, int f_v, int i_h, int i_v,
- int x1, int y1, int x2, int y2);
+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 table_area_style
+ {
+ struct cell_style cell_style;
+ struct font_style font_style;
+ };
+
+#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 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 *);
-/* Text options, passed in the `opt' argument. */
+/* Cell properties. */
enum
{
- TAT_NONE = 0, /* No options. */
- TAT_TITLE = 0x0200 | TAB_EMPH, /* Title attributes. */
- TAT_NOWRAP = 0x0800 /* No text wrap (tab_output_text() only). */
+ TABLE_CELL_ROTATE = 1 << 0, /* Rotate cell contents 90 degrees. */
+ TABLE_CELL_JOIN = 1 << 1, /* Joined cell (internal use only). */
+ TABLE_CELL_STYLE_SHIFT = 2,
+ TABLE_CELL_STYLE_MASK = 7 << TABLE_CELL_STYLE_SHIFT,
};
-/* Cells. */
-struct fmt_spec;
-struct dictionary;
-union value;
-void tab_value (struct tab_table *, int c, int r, unsigned char opt,
- const union value *, const struct dictionary *dict,
- const struct fmt_spec *);
+/* A table. */
+struct table
+ {
+ struct pool *container;
+
+ /* Table size.
-void tab_fixed (struct tab_table *, int c, int r, unsigned char opt,
- double v, int w, int d);
+ n[TABLE_HORZ]: Number of columns.
+ n[TABLE_VERT]: Number of rows. */
+ int n[TABLE_N_AXES];
-void tab_double (struct tab_table *, int c, int r, unsigned char opt,
- double v, const struct fmt_spec *);
+ /* Table headers.
-void tab_text (struct tab_table *, int c, int r, unsigned opt, const char *);
-void tab_text_format (struct tab_table *, int c, int r, unsigned opt,
- const char *, ...)
- PRINTF_FORMAT (5, 6);
+ 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. If the table must be
+ broken across more than one page for output, headers rows and columns
+ are repeated on each page.
-void tab_joint_text (struct tab_table *, int x1, int y1, int x2, int y2,
- unsigned opt, const char *);
-void tab_joint_text_format (struct tab_table *, int x1, int y1, int x2, int y2,
- unsigned opt, const char *, ...)
- PRINTF_FORMAT (7, 8);
+ h[TABLE_HORZ][0]: Left header columns.
+ h[TABLE_HORZ][1]: Right header columns.
+ h[TABLE_VERT][0]: Top header rows.
+ h[TABLE_VERT][1]: Bottom header rows. */
+ int h[TABLE_N_AXES][2];
-/* Editing. */
-void tab_offset (struct tab_table *, int col, int row);
-void tab_next_row (struct tab_table *);
+ /* Reference count. A table may be shared between multiple owners,
+ indicated by a reference count greater than 1. When this is the case,
+ the table must not be modified. */
+ int ref_cnt;
-/* Current row/column offset. */
-#define tab_row(TABLE) ((TABLE)->row_ofs)
-#define tab_col(TABLE) ((TABLE)->col_ofs)
+ /* Table contents.
-/* Simple output. */
-void tab_output_text (int options, const char *string);
-void tab_output_text_format (int options, const char *, ...)
- PRINTF_FORMAT (2, 3);
+ Each array element in cc[] is ordinarily a "struct pivot_value *". If
+ TABLE_CELL_JOIN is set in cp[] for the element, however, it is a joined
+ cell and the corresponding element of cc[] points to a struct
+ table_cell. */
+ void **cc; /* Cell contents; void *[nr][nc]. */
+ unsigned char *cp; /* Cell properties; unsigned char[nr][nc]. */
+ struct table_area_style *styles[8];
+
+ /* Rules. */
+ unsigned char *rh; /* Horiz rules; unsigned char[nr+1][nc]. */
+ unsigned char *rv; /* Vert rules; unsigned char[nr][nc+1]. */
+ struct table_border_style *borders;
+ size_t n_borders;
+ };
+
+/* Reference counting. */
+struct table *table_ref (const struct table *);
+void table_unref (struct table *);
+bool table_is_shared (const struct table *);
+
+/* Tables. */
+struct table *table_create (int nc, int nr, int hl, int hr, int ht, int hb);
+
+/* Rules. */
+void table_hline (struct table *, int style, int x1, int x2, int y);
+void table_vline (struct table *, int style, int x, int y1, int y2);
+
+/* Cells. */
+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 *);
-#endif /* tab_h */
+bool table_cell_is_empty (const struct table *, int c, int r);
+#endif /* output/table.h */