X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Frender.c;h=08f89a177ed1cc1c3c073974923dff0f4c57e354;hb=dc341c8d3ebc6ac700c7d92eb289bc7a0f4431c1;hp=f73137f0e35eafe8ab11b8981de11998f01c73cf;hpb=f278ec924a1f795d06a497ca44866aac4cde5c9f;p=pspp diff --git a/src/output/render.c b/src/output/render.c index f73137f0e3..08f89a177e 100644 --- a/src/output/render.c +++ b/src/output/render.c @@ -26,9 +26,9 @@ #include "libpspp/hash-functions.h" #include "libpspp/hmap.h" #include "libpspp/pool.h" +#include "output/pivot-output.h" +#include "output/pivot-table.h" #include "output/render.h" -#include "output/tab.h" -#include "output/table-item.h" #include "output/table.h" #include "gl/minmax.h" @@ -56,9 +56,20 @@ struct render_page struct table *table; /* Table rendered. */ int ref_cnt; - /* Local copies of table->n and table->h, for convenience. */ - int n[TABLE_N_AXES]; + /* Region of 'table' to render. + + The horizontal cells rendered are the leftmost h[H][0], then + r[H][0] through r[H][1], exclusive, then the rightmost h[H][1]. + + The vertical cells rendered are the topmost h[V][0], then r[V][0] + through r[V][1], exclusive, then the bottommost h[V][1]. + + n[H] = h[H][0] + (r[H][1] - r[H][0]) + h[H][1] + n[V] = h[V][0] + (r[V][1] - r[V][0]) + h[V][1] + */ int h[TABLE_N_AXES][2]; + int r[TABLE_N_AXES][2]; + int n[TABLE_N_AXES]; /* "Cell positions". @@ -68,8 +79,8 @@ struct render_page cp[H][2] = cp[H][1] + the width of the leftmost column. cp[H][3] = cp[H][2] + the width of the second-from-left vertical rule. and so on: - cp[H][2 * nc] = x position of the rightmost vertical rule. - cp[H][2 * nc + 1] = total table width including all rules. + cp[H][2 * n[H]] = x position of the rightmost vertical rule. + cp[H][2 * n[H] + 1] = total table width including all rules. Similarly, cp[V] represents y positions within the table. cp[V][0] = 0. @@ -77,8 +88,8 @@ struct render_page cp[V][2] = cp[V][1] + the height of the topmost row. cp[V][3] = cp[V][2] + the height of the second-from-top horizontal rule. and so on: - cp[V][2 * nr] = y position of the bottommost horizontal rule. - cp[V][2 * nr + 1] = total table height including all rules. + cp[V][2 * n[V]] = y position of the bottommost horizontal rule. + cp[V][2 * n[V] + 1] = total table height including all rules. Rules and columns can have width or height 0, in which case consecutive values in this array are equal. */ @@ -134,7 +145,7 @@ struct render_page }; static struct render_page *render_page_create (const struct render_params *, - struct table *); + struct table *, int min_width); struct render_page *render_page_ref (const struct render_page *page_); static void render_page_unref (struct render_page *); @@ -178,6 +189,13 @@ axis_width (const struct render_page *page, int axis, int ofs0, int ofs1) return page->cp[axis][ofs1] - page->cp[axis][ofs0]; } +/* Returns the total width of PAGE along AXIS. */ +static int +table_width (const struct render_page *page, int axis) +{ + return page->cp[axis][2 * page->n[axis] + 1]; +} + /* Returns the width of the headers in PAGE along AXIS. */ static int headers_width (const struct render_page *page, int axis) @@ -227,10 +245,9 @@ max_cell_width (const struct render_page *page, int axis) int n = page->n[axis]; int x0 = page->h[axis][0]; int x1 = n - page->h[axis][1]; - int x, max; - max = 0; - for (x = x0; x < x1; x++) + int max = 0; + for (int x = x0; x < x1; x++) { int w = cell_width (page, axis, x); if (w > max) @@ -421,12 +438,9 @@ accumulate_row_widths (const struct render_page *page, enum table_axis axis, const struct render_row *rows, const int *rules) { int n = page->n[axis]; - int *cp; - int z; - - cp = page->cp[axis]; + int *cp = page->cp[axis]; cp[0] = 0; - for (z = 0; z < n; z++) + for (int z = 0; z < n; z++) { cp[1] = cp[0] + rules[z]; cp[2] = cp[1] + rows[z].width; @@ -439,13 +453,10 @@ accumulate_row_widths (const struct render_page *page, enum table_axis axis, static int calculate_table_width (int n, const struct render_row *rows, int *rules) { - int width; - int x; - - width = 0; - for (x = 0; x < n; x++) + int width = 0; + for (int x = 0; x < n; x++) width += rows[x].width; - for (x = 0; x <= n; x++) + for (int x = 0; x <= n; x++) width += rules[x]; return width; @@ -459,17 +470,17 @@ rule_to_render_type (unsigned char type) { switch (type) { - case TAL_NONE: + case TABLE_STROKE_NONE: return RENDER_LINE_NONE; - case TAL_SOLID: + case TABLE_STROKE_SOLID: return RENDER_LINE_SINGLE; - case TAL_DASHED: + case TABLE_STROKE_DASHED: return RENDER_LINE_DASHED; - case TAL_THICK: + case TABLE_STROKE_THICK: return RENDER_LINE_THICK; - case TAL_THIN: + case TABLE_STROKE_THIN: return RENDER_LINE_THIN; - case TAL_DOUBLE: + case TABLE_STROKE_DOUBLE: return RENDER_LINE_DOUBLE; default: NOT_REACHED (); @@ -483,61 +494,53 @@ measure_rule (const struct render_params *params, const struct table *table, enum table_axis a, int z) { enum table_axis b = !a; - unsigned int rules; - int d[TABLE_N_AXES]; /* Determine all types of rules that are present, as a bitmap in 'rules' where rule type 't' is present if bit 2**t is set. */ struct cell_color color; - rules = 0; + unsigned int rules = 0; + int d[TABLE_N_AXES]; d[a] = z; for (d[b] = 0; d[b] < table->n[b]; d[b]++) rules |= 1u << table_get_rule (table, a, d[H], d[V], &color); - /* Turn off TAL_NONE because it has width 0 and we needn't bother. However, - if the device doesn't support margins, make sure that there is at least a - small gap between cells (but we don't need any at the left or right edge - of the table). */ - if (rules & (1u << TAL_NONE)) + /* Turn off TABLE_STROKE_NONE because it has width 0 and we needn't bother. + However, if the device doesn't support margins, make sure that there is at + least a small gap between cells (but we don't need any at the left or + right edge of the table). */ + if (rules & (1u << TABLE_STROKE_NONE)) { - rules &= ~(1u << TAL_NONE); + rules &= ~(1u << TABLE_STROKE_NONE); if (z > 0 && z < table->n[a] && !params->supports_margins && a == H) - rules |= 1u << TAL_SOLID; + rules |= 1u << TABLE_STROKE_SOLID; } /* Calculate maximum width of the rules that are present. */ int width = 0; - for (size_t i = 0; i < N_LINES; i++) + for (size_t i = 0; i < TABLE_N_STROKES; i++) if (rules & (1u << i)) - width = MAX (width, params->line_widths[a][rule_to_render_type (i)]); + width = MAX (width, params->line_widths[rule_to_render_type (i)]); return width; } /* Allocates and returns a new render_page using PARAMS and TABLE. Allocates - space for all of the members of the new page, but the caller must initialize - the 'cp' member itself. */ + space for rendering a table with dimensions given in N. The caller must + initialize most of the members itself. */ static struct render_page * -render_page_allocate (const struct render_params *params, - struct table *table) +render_page_allocate__ (const struct render_params *params, + struct table *table, int n[TABLE_N_AXES]) { - struct render_page *page; - int i; - - page = xmalloc (sizeof *page); + struct render_page *page = xmalloc (sizeof *page); page->params = params; page->table = table; page->ref_cnt = 1; - page->n[H] = table->n[H]; - page->n[V] = table->n[V]; - page->h[H][0] = table->h[H][0]; - page->h[H][1] = table->h[H][1]; - page->h[V][0] = table->h[V][0]; - page->h[V][1] = table->h[V][1]; - - for (i = 0; i < TABLE_N_AXES; i++) + page->n[H] = n[H]; + page->n[V] = n[V]; + + for (int i = 0; i < TABLE_N_AXES; i++) { - page->cp[i] = xmalloc ((2 * page->n[i] + 2) * sizeof *page->cp[i]); - page->join_crossing[i] = xzalloc ((page->n[i] + 1) * sizeof *page->join_crossing[i]); + page->cp[i] = xcalloc ((2 * n[i] + 2) , sizeof *page->cp[i]); + page->join_crossing[i] = xcalloc ((n[i] + 1) , sizeof *page->join_crossing[i]); } hmap_init (&page->overflows); @@ -546,6 +549,23 @@ render_page_allocate (const struct render_params *params, return page; } +/* Allocates and returns a new render_page using PARAMS and TABLE. Allocates + space for all of the members of the new page, but the caller must initialize + the 'cp' member itself. */ +static struct render_page * +render_page_allocate (const struct render_params *params, struct table *table) +{ + struct render_page *page = render_page_allocate__ (params, table, table->n); + for (enum table_axis a = 0; a < TABLE_N_AXES; a++) + { + page->h[a][0] = table->h[a][0]; + page->h[a][1] = table->h[a][1]; + page->r[a][0] = table->h[a][0]; + page->r[a][1] = table->n[a] - table->h[a][1]; + } + return page; +} + /* Allocates and returns a new render_page for PARAMS and TABLE, initializing cp[H] in the new page from ROWS and RULES. The caller must still initialize cp[V]. */ @@ -603,18 +623,84 @@ create_page_with_interpolated_widths (const struct render_params *params, assert (page->cp[H][n * 2 + 1] == params->size[H]); return page; } - static void set_join_crossings (struct render_page *page, enum table_axis axis, const struct table_cell *cell, int *rules) { - int z; - - for (z = cell->d[axis][0] + 1; z <= cell->d[axis][1] - 1; z++) + for (int z = cell->d[axis][0] + 1; z <= cell->d[axis][1] - 1; z++) page->join_crossing[axis][z] = rules[z]; } +/* Maps a contiguous range of cells from a page to the underlying table along + the horizpntal or vertical dimension. */ +struct map + { + int p0; /* First ordinate in the page. */ + int t0; /* First ordinate in the table. */ + int n; /* Number of ordinates in page and table. */ + }; + +/* Initializes M to a mapping from PAGE to PAGE->table along axis A. The + mapping includes ordinate Z (in PAGE). */ +static void +get_map (const struct render_page *page, enum table_axis a, int z, + struct map *m) +{ + if (z < page->h[a][0]) + { + m->p0 = 0; + m->t0 = 0; + m->n = page->h[a][0]; + } + else if (z < page->n[a] - page->h[a][1]) + { + m->p0 = page->h[a][0]; + m->t0 = page->r[a][0]; + m->n = page->r[a][1] - page->r[a][0]; + } + else + { + m->p0 = page->n[a] - page->h[a][1]; + m->t0 = page->table->n[a] - page->table->h[a][1]; + m->n = page->h[a][1]; + } +} + +/* Initializes CELL with the contents of the table cell at column X and row Y + within PAGE. When CELL is no longer needed, the caller is responsible for + freeing it by calling table_cell_free(CELL). + + The caller must ensure that CELL is destroyed before TABLE is unref'ed. + + This is equivalent to table_get_cell(), except X and Y are in terms of the + page's rows and columns rather than the underlying table's. */ +static void +render_get_cell (const struct render_page *page, int x, int y, + struct table_cell *cell) +{ + int d[TABLE_N_AXES] = { [H] = x, [V] = y }; + struct map map[TABLE_N_AXES]; + + for (enum table_axis a = 0; a < TABLE_N_AXES; a++) + { + struct map *m = &map[a]; + get_map (page, a, d[a], m); + d[a] += m->t0 - m->p0; + } + table_get_cell (page->table, d[H], d[V], cell); + + for (enum table_axis a = 0; a < TABLE_N_AXES; a++) + { + struct map *m = &map[a]; + + for (int i = 0; i < 2; i++) + cell->d[a][i] -= m->t0 - m->p0; + cell->d[a][0] = MAX (cell->d[a][0], m->p0); + cell->d[a][1] = MIN (cell->d[a][1], m->p0 + m->n); + } +} + /* Creates and returns a new render_page for rendering TABLE on a device described by PARAMS. @@ -622,39 +708,32 @@ set_join_crossings (struct render_page *page, enum table_axis axis, size is PARAMS->size, but the caller is responsible for actually breaking it up to fit on such a device, using the render_break abstraction. */ static struct render_page * -render_page_create (const struct render_params *params, struct table *table) +render_page_create (const struct render_params *params, struct table *table, + int min_width) { - struct render_page *page; enum { MIN, MAX }; - struct render_row *columns[2]; - struct render_row *rows; - int table_widths[2]; - int *rules[TABLE_N_AXES]; - int nr, nc; - int x, y; - int i; - enum table_axis axis; - nc = table_nc (table); - nr = table_nr (table); + int nc = table->n[H]; + int nr = table->n[V]; /* Figure out rule widths. */ - for (axis = 0; axis < TABLE_N_AXES; axis++) + int *rules[TABLE_N_AXES]; + for (enum table_axis axis = 0; axis < TABLE_N_AXES; axis++) { int n = table->n[axis] + 1; - int z; rules[axis] = xnmalloc (n, sizeof *rules); - for (z = 0; z < n; z++) + for (int z = 0; z < n; z++) rules[axis][z] = measure_rule (params, table, axis, z); } /* Calculate minimum and maximum widths of cells that do not span multiple columns. */ - for (i = 0; i < 2; i++) - columns[i] = xzalloc (nc * sizeof *columns[i]); - for (y = 0; y < nr; y++) - for (x = 0; x < nc; ) + struct render_row *columns[2]; + for (int i = 0; i < 2; i++) + columns[i] = xcalloc (nc, sizeof *columns[i]); + for (int y = 0; y < nr; y++) + for (int x = 0; x < nc;) { struct table_cell cell; @@ -664,25 +743,22 @@ render_page_create (const struct render_params *params, struct table *table) if (table_cell_colspan (&cell) == 1) { int w[2]; - int i; - - params->measure_cell_width (params->aux, &cell, - &w[MIN], &w[MAX]); - for (i = 0; i < 2; i++) + params->ops->measure_cell_width (params->aux, &cell, + &w[MIN], &w[MAX]); + for (int i = 0; i < 2; i++) if (columns[i][x].unspanned < w[i]) columns[i][x].unspanned = w[i]; } } x = cell.d[H][1]; - table_cell_free (&cell); } /* Distribute widths of spanned columns. */ - for (i = 0; i < 2; i++) - for (x = 0; x < nc; x++) + for (int i = 0; i < 2; i++) + for (int x = 0; x < nc; x++) columns[i][x].width = columns[i][x].unspanned; - for (y = 0; y < nr; y++) - for (x = 0; x < nc; ) + for (int y = 0; y < nr; y++) + for (int x = 0; x < nc;) { struct table_cell cell; @@ -691,26 +767,32 @@ render_page_create (const struct render_params *params, struct table *table) { int w[2]; - params->measure_cell_width (params->aux, &cell, &w[MIN], &w[MAX]); - for (i = 0; i < 2; i++) + params->ops->measure_cell_width (params->aux, &cell, + &w[MIN], &w[MAX]); + for (int i = 0; i < 2; i++) distribute_spanned_width (w[i], &columns[i][cell.d[H][0]], rules[H], table_cell_colspan (&cell)); } x = cell.d[H][1]; - table_cell_free (&cell); } + if (min_width > 0) + for (int i = 0; i < 2; i++) + distribute_spanned_width (min_width, &columns[i][0], rules[H], nc); /* In pathological cases, spans can cause the minimum width of a column to exceed the maximum width. This bollixes our interpolation algorithm later, so fix it up. */ - for (i = 0; i < nc; i++) + for (int i = 0; i < nc; i++) if (columns[MIN][i].width > columns[MAX][i].width) columns[MAX][i].width = columns[MIN][i].width; /* Decide final column widths. */ - for (i = 0; i < 2; i++) - table_widths[i] = calculate_table_width (table_nc (table), + int table_widths[2]; + for (int i = 0; i < 2; i++) + table_widths[i] = calculate_table_width (table->n[H], columns[i], rules[H]); + + struct render_page *page; if (table_widths[MAX] <= params->size[H]) { /* Fits even with maximum widths. Use them. */ @@ -733,53 +815,50 @@ render_page_create (const struct render_params *params, struct table *table) } /* Calculate heights of cells that do not span multiple rows. */ - rows = xzalloc (nr * sizeof *rows); - for (y = 0; y < nr; y++) - { - for (x = 0; x < nc; ) - { - struct render_row *r = &rows[y]; - struct table_cell cell; + struct render_row *rows = XCALLOC (nr, struct render_row); + for (int y = 0; y < nr; y++) + for (int x = 0; x < nc;) + { + struct render_row *r = &rows[y]; + struct table_cell cell; - table_get_cell (table, x, y, &cell); - if (y == cell.d[V][0]) - { - if (table_cell_rowspan (&cell) == 1) - { - int w = joined_width (page, H, cell.d[H][0], cell.d[H][1]); - int h = params->measure_cell_height (params->aux, &cell, w); - if (h > r->unspanned) - r->unspanned = r->width = h; - } - else - set_join_crossings (page, V, &cell, rules[V]); - - if (table_cell_colspan (&cell) > 1) - set_join_crossings (page, H, &cell, rules[H]); - } - x = cell.d[H][1]; - table_cell_free (&cell); - } - } - for (i = 0; i < 2; i++) + render_get_cell (page, x, y, &cell); + if (y == cell.d[V][0]) + { + if (table_cell_rowspan (&cell) == 1) + { + int w = joined_width (page, H, cell.d[H][0], cell.d[H][1]); + int h = params->ops->measure_cell_height (params->aux, + &cell, w); + if (h > r->unspanned) + r->unspanned = r->width = h; + } + else + set_join_crossings (page, V, &cell, rules[V]); + + if (table_cell_colspan (&cell) > 1) + set_join_crossings (page, H, &cell, rules[H]); + } + x = cell.d[H][1]; + } + for (int i = 0; i < 2; i++) free (columns[i]); /* Distribute heights of spanned rows. */ - for (y = 0; y < nr; y++) - for (x = 0; x < nc; ) + for (int y = 0; y < nr; y++) + for (int x = 0; x < nc;) { struct table_cell cell; - table_get_cell (table, x, y, &cell); + render_get_cell (page, x, y, &cell); if (y == cell.d[V][0] && table_cell_rowspan (&cell) > 1) { int w = joined_width (page, H, cell.d[H][0], cell.d[H][1]); - int h = params->measure_cell_height (params->aux, &cell, w); + int h = params->ops->measure_cell_height (params->aux, &cell, w); distribute_spanned_width (h, &rows[cell.d[V][0]], rules[V], table_cell_rowspan (&cell)); } x = cell.d[H][1]; - table_cell_free (&cell); } /* Decide final row heights. */ @@ -787,15 +866,15 @@ render_page_create (const struct render_params *params, struct table *table) free (rows); /* Measure headers. If they are "too big", get rid of them. */ - for (axis = 0; axis < TABLE_N_AXES; axis++) + for (enum table_axis axis = 0; axis < TABLE_N_AXES; axis++) { int hw = headers_width (page, axis); if (hw * 2 >= page->params->size[axis] || hw + max_cell_width (page, axis) > page->params->size[axis]) { - page->table = table_unshare (page->table); - page->table->h[axis][0] = page->table->h[axis][1] = 0; page->h[axis][0] = page->h[axis][1] = 0; + page->r[axis][0] = 0; + page->r[axis][1] = page->n[axis]; } } @@ -821,9 +900,7 @@ render_page_unref (struct render_page *page) { if (page != NULL && --page->ref_cnt == 0) { - int i; struct render_overflow *overflow, *next; - HMAP_FOR_EACH_SAFE (overflow, next, struct render_overflow, node, &page->overflows) free (overflow); @@ -831,7 +908,7 @@ render_page_unref (struct render_page *page) table_unref (page->table); - for (i = 0; i < TABLE_N_AXES; ++i) + for (int i = 0; i < TABLE_N_AXES; ++i) { free (page->join_crossing[i]); free (page->cp[i]); @@ -853,15 +930,13 @@ render_page_get_size (const struct render_page *page, enum table_axis axis) static int render_page_get_best_breakpoint (const struct render_page *page, int height) { - int y; - /* If there's no room for at least the top row and the rules above and below it, don't include any of the table. */ if (page->cp[V][3] > height) return 0; /* Otherwise include as many rows and rules as we can. */ - for (y = 5; y <= 2 * page->n[V] + 1; y += 2) + for (int y = 5; y <= 2 * page->n[V] + 1; y += 2) if (page->cp[V][y] > height) return page->cp[V][y - 2]; return height; @@ -869,13 +944,47 @@ render_page_get_best_breakpoint (const struct render_page *page, int height) /* Drawing render_pages. */ -static inline enum render_line_style +/* This is like table_get_rule() except: + + - D is in terms of the page's rows and column rather than the underlying + table's. + + - The result is in the form of a render_line_style. */ +static enum render_line_style get_rule (const struct render_page *page, enum table_axis axis, - const int d[TABLE_N_AXES], struct cell_color *color) + const int d_[TABLE_N_AXES], struct cell_color *color) { - return rule_to_render_type (table_get_rule (page->table, - axis, d[H] / 2, d[V] / 2, - color)); + int d[TABLE_N_AXES] = { d_[0] / 2, d_[1] / 2 }; + int d2 = -1; + + enum table_axis a = axis; + if (d[a] < page->h[a][0]) + /* Nothing to do */; + else if (d[a] <= page->n[a] - page->h[a][1]) + { + if (page->h[a][0] && d[a] == page->h[a][0]) + d2 = page->h[a][0]; + else if (page->h[a][1] && d[a] == page->n[a] - page->h[a][1]) + d2 = page->table->n[a] - page->h[a][1]; + d[a] += page->r[a][0] - page->h[a][0]; + } + else + d[a] += ((page->table->n[a] - page->table->h[a][1]) + - (page->n[a] - page->h[a][1])); + + enum table_axis b = !axis; + struct map m; + get_map (page, b, d[b], &m); + d[b] += m.t0 - m.p0; + + int r = table_get_rule (page->table, axis, d[H], d[V], color); + if (d2 >= 0) + { + d[a] = d2; + int r2 = table_get_rule (page->table, axis, d[H], d[V], color); + r = table_stroke_combine (r, r2); + } + return rule_to_render_type (r); } static bool @@ -892,11 +1001,12 @@ render_direction_rtl (void) this string with "output-direction-rtl". Otherwise either leave it untranslated or copy it verbatim. */ const char *dir = _("output-direction-ltr"); - if ( 0 == strcmp ("output-direction-rtl", dir)) + if (0 == strcmp ("output-direction-rtl", dir)) return true; - if ( 0 != strcmp ("output-direction-ltr", dir)) - fprintf (stderr, "This localisation has been incorrectly translated. Complain to the translator.\n"); + if (0 != strcmp ("output-direction-ltr", dir)) + fprintf (stderr, "This localisation has been incorrectly translated. " + "Complain to the translator.\n"); return false; } @@ -907,9 +1017,8 @@ render_rule (const struct render_page *page, const int ofs[TABLE_N_AXES], { enum render_line_style styles[TABLE_N_AXES][2]; struct cell_color colors[TABLE_N_AXES][2]; - enum table_axis a; - for (a = 0; a < TABLE_N_AXES; a++) + for (enum table_axis a = 0; a < TABLE_N_AXES; a++) { enum table_axis b = !a; @@ -931,7 +1040,7 @@ render_rule (const struct render_page *page, const int ofs[TABLE_N_AXES], styles[a][0] = get_rule (page, a, e, &colors[a][0]); } - if (d[b] / 2 < page->table->n[b]) + if (d[b] / 2 < page->n[b]) styles[a][1] = get_rule (page, a, d, &colors[a][1]); } else @@ -948,7 +1057,7 @@ render_rule (const struct render_page *page, const int ofs[TABLE_N_AXES], bb[H][0] = ofs[H] + page->cp[H][d[H]]; bb[H][1] = ofs[H] + page->cp[H][d[H] + 1]; - if (render_direction_rtl ()) + if (page->params->rtl) { int temp = bb[H][0]; bb[H][0] = render_page_get_size (page, H) - bb[H][1]; @@ -956,7 +1065,7 @@ render_rule (const struct render_page *page, const int ofs[TABLE_N_AXES], } bb[V][0] = ofs[V] + page->cp[V][d[V]]; bb[V][1] = ofs[V] + page->cp[V][d[V] + 1]; - page->params->draw_line (page->params->aux, bb, styles, colors); + page->params->ops->draw_line (page->params->aux, bb, styles, colors); } } @@ -964,13 +1073,12 @@ static void render_cell (const struct render_page *page, const int ofs[TABLE_N_AXES], const struct table_cell *cell) { - const struct render_overflow *of; int bb[TABLE_N_AXES][2]; int clip[TABLE_N_AXES][2]; bb[H][0] = clip[H][0] = ofs[H] + page->cp[H][cell->d[H][0] * 2 + 1]; bb[H][1] = clip[H][1] = ofs[H] + page->cp[H][cell->d[H][1] * 2]; - if (render_direction_rtl ()) + if (page->params->rtl) { int temp = bb[H][0]; bb[H][0] = clip[H][0] = render_page_get_size (page, H) - bb[H][1]; @@ -979,43 +1087,41 @@ render_cell (const struct render_page *page, const int ofs[TABLE_N_AXES], bb[V][0] = clip[V][0] = ofs[V] + page->cp[V][cell->d[V][0] * 2 + 1]; bb[V][1] = clip[V][1] = ofs[V] + page->cp[V][cell->d[V][1] * 2]; - int valign = (cell->n_contents - ? cell->contents->options & TAB_VALIGN - : TAB_TOP); - if (valign != TAB_TOP) + enum table_valign valign = cell->cell_style->valign; + int valign_offset = 0; + if (valign != TABLE_VALIGN_TOP) { - int height = page->params->measure_cell_height ( + int height = page->params->ops->measure_cell_height ( page->params->aux, cell, bb[H][1] - bb[H][0]); int extra = bb[V][1] - bb[V][0] - height; if (extra > 0) { - if (valign == TAB_MIDDLE) + if (valign == TABLE_VALIGN_CENTER) extra /= 2; - bb[V][0] += extra; + valign_offset += extra; } } - of = find_overflow (page, cell->d[H][0], cell->d[V][0]); + const struct render_overflow *of = find_overflow ( + page, cell->d[H][0], cell->d[V][0]); if (of) - { - enum table_axis axis; - - for (axis = 0; axis < TABLE_N_AXES; axis++) - { - if (of->overflow[axis][0]) - { - bb[axis][0] -= of->overflow[axis][0]; - if (cell->d[axis][0] == 0 && !page->is_edge_cutoff[axis][0]) - clip[axis][0] = ofs[axis] + page->cp[axis][cell->d[axis][0] * 2]; - } - if (of->overflow[axis][1]) - { - bb[axis][1] += of->overflow[axis][1]; - if (cell->d[axis][1] == page->n[axis] && !page->is_edge_cutoff[axis][1]) - clip[axis][1] = ofs[axis] + page->cp[axis][cell->d[axis][1] * 2 + 1]; - } - } - } + for (enum table_axis axis = 0; axis < TABLE_N_AXES; axis++) + { + if (of->overflow[axis][0]) + { + bb[axis][0] -= of->overflow[axis][0]; + if (cell->d[axis][0] == 0 && !page->is_edge_cutoff[axis][0]) + clip[axis][0] = ofs[axis] + page->cp[axis][cell->d[axis][0] * 2]; + } + if (of->overflow[axis][1]) + { + bb[axis][1] += of->overflow[axis][1]; + if (cell->d[axis][1] == page->n[axis] + && !page->is_edge_cutoff[axis][1]) + clip[axis][1] = ofs[axis] + page->cp[axis][cell->d[axis][1] * 2 + + 1]; + } + } int spill[TABLE_N_AXES][2]; for (enum table_axis axis = 0; axis < TABLE_N_AXES; axis++) @@ -1024,7 +1130,12 @@ render_cell (const struct render_page *page, const int ofs[TABLE_N_AXES], spill[axis][1] = rule_width (page, axis, cell->d[axis][1]) / 2; } - page->params->draw_cell (page->params->aux, cell, bb, spill, clip); + int color_idx = (cell->d[V][0] < page->h[V][0] + || page->n[V] - (cell->d[V][0] + 1) < page->h[V][1] + ? 0 + : (cell->d[V][0] - page->h[V][0]) & 1); + page->params->ops->draw_cell (page->params->aux, cell, color_idx, + bb, valign_offset, spill, clip); } /* Draws the cells of PAGE indicated in BB. */ @@ -1033,16 +1144,15 @@ render_page_draw_cells (const struct render_page *page, int ofs[TABLE_N_AXES], int bb[TABLE_N_AXES][2]) { for (int y = bb[V][0]; y < bb[V][1]; y++) - for (int x = bb[H][0]; x < bb[H][1]; ) + for (int x = bb[H][0]; x < bb[H][1];) if (!is_rule (x) && !is_rule (y)) { struct table_cell cell; - table_get_cell (page->table, x / 2, y / 2, &cell); + render_get_cell (page, x / 2, y / 2, &cell); if (y / 2 == bb[V][0] / 2 || y / 2 == cell.d[V][0]) render_cell (page, ofs, &cell); x = rule_ofs (cell.d[H][1]); - table_cell_free (&cell); } else x++; @@ -1077,11 +1187,9 @@ render_page_draw (const struct render_page *page, int ofs[TABLE_N_AXES]) static int get_clip_min_extent (int x0, const int cp[], int n) { - int low, high, best; - - low = 0; - high = n; - best = 0; + int low = 0; + int high = n; + int best = 0; while (low < high) { int middle = low + (high - low) / 2; @@ -1102,11 +1210,9 @@ get_clip_min_extent (int x0, const int cp[], int n) static int get_clip_max_extent (int x1, const int cp[], int n) { - int low, high, best; - - low = 0; - high = n; - best = n; + int low = 0; + int high = n; + int best = n; while (low < high) { int middle = low + (high - low) / 2; @@ -1217,12 +1323,12 @@ render_break_next (struct render_break *b, int size) const struct render_page *page = b->page; enum table_axis axis = b->axis; struct render_page *subpage; - int z, pixel; if (!render_break_has_next (b)) return NULL; - pixel = 0; + int pixel = 0; + int z; for (z = b->z; z < page->n[axis] - page->h[axis][1]; z++) { int needed = needed_size (b, z + 1); @@ -1273,38 +1379,31 @@ render_break_next (struct render_break *b, int size) being broken have a better internal breakpoint than the exact number of pixels available, which might look bad e.g. because it breaks in the middle of a line of text. */ - if (axis == TABLE_VERT && page->params->adjust_break) - { - int x; - - for (x = 0; x < page->n[H]; ) - { - struct table_cell cell; - int better_pixel; - int w; - - table_get_cell (page->table, x, z, &cell); - w = joined_width (page, H, cell.d[H][0], cell.d[H][1]); - better_pixel = page->params->adjust_break ( - page->params->aux, &cell, w, pixel); - x = cell.d[H][1]; - table_cell_free (&cell); - - if (better_pixel < pixel) - { - if (better_pixel > (z == b->z ? b->pixel : 0)) - { - pixel = better_pixel; - break; - } - else if (better_pixel == 0 && z != b->z) - { - pixel = 0; - break; - } - } - } - } + if (axis == TABLE_VERT && page->params->ops->adjust_break) + for (int x = 0; x < page->n[H];) + { + struct table_cell cell; + + render_get_cell (page, x, z, &cell); + int w = joined_width (page, H, cell.d[H][0], cell.d[H][1]); + int better_pixel = page->params->ops->adjust_break ( + page->params->aux, &cell, w, pixel); + x = cell.d[H][1]; + + if (better_pixel < pixel) + { + if (better_pixel > (z == b->z ? b->pixel : 0)) + { + pixel = better_pixel; + break; + } + else if (better_pixel == 0 && z != b->z) + { + pixel = 0; + break; + } + } + } } break; } @@ -1329,10 +1428,9 @@ needed_size (const struct render_break *b, int cell) { const struct render_page *page = b->page; enum table_axis axis = b->axis; - int size; /* Width of left header not including its rightmost rule. */ - size = axis_width (page, axis, 0, rule_ofs (page->h[axis][0])); + int size = axis_width (page, axis, 0, rule_ofs (page->h[axis][0])); /* If we have a pixel offset and there is no left header, then we omit the leftmost rule of the body. Otherwise the rendering is deceptive because @@ -1382,24 +1480,25 @@ cell_is_breakable (const struct render_break *b, int cell) struct render_pager { const struct render_params *params; + double scale; - struct render_page **pages; - size_t n_pages, allocated_pages; + /* An array of "render_page"s to be rendered, in order, vertically. There + may be up to 5 pages, for the pivot table's title, layers, body, + captions, and footnotes. */ + struct render_page *pages[5]; + size_t n_pages; size_t cur_page; struct render_break x_break; struct render_break y_break; }; -static const struct render_page * -render_pager_add_table (struct render_pager *p, struct table *table) +static void +render_pager_add_table (struct render_pager *p, struct table *table, + int min_width) { - struct render_page *page; - - if (p->n_pages >= p->allocated_pages) - p->pages = x2nrealloc (p->pages, &p->allocated_pages, sizeof *p->pages); - page = p->pages[p->n_pages++] = render_page_create (p->params, table); - return page; + if (table) + p->pages[p->n_pages++] = render_page_create (p->params, table, min_width); } static void @@ -1410,73 +1509,67 @@ render_pager_start_page (struct render_pager *p) render_break_init_empty (&p->y_break); } -static void -add_footnote_page (struct render_pager *p, const struct table_item *item) -{ - const struct footnote **f; - size_t n_footnotes = table_collect_footnotes (item, &f); - if (!n_footnotes) - return; - - struct tab_table *t = tab_create (2, n_footnotes); - - for (size_t i = 0; i < n_footnotes; i++) - if (f[i]) - { - tab_text_format (t, 0, i, TAB_LEFT, "%s.", f[i]->marker); - tab_text (t, 1, i, TAB_LEFT, f[i]->content); - if (f[i]->style) - { - tab_add_style (t, 0, i, f[i]->style); - tab_add_style (t, 1, i, f[i]->style); - } - } - render_pager_add_table (p, &t->table); - - free (f); -} - -static void -add_text_page (struct render_pager *p, const struct table_item_text *t) -{ - if (!t) - return; - - struct tab_table *tab = tab_create (1, 1); - tab_text (tab, 0, 0, TAB_LEFT, t->content); - for (size_t i = 0; i < t->n_footnotes; i++) - tab_add_footnote (tab, 0, 0, t->footnotes[i]); - if (t->style) - { - tab->styles[0] = pool_clone (tab->container, t->style, sizeof *t->style); - if (t->style->font) - tab->styles[0]->font = pool_strdup (tab->container, t->style->font); - } - render_pager_add_table (p, &tab->table); -} - -/* Creates and returns a new render_pager for rendering TABLE_ITEM on the - device with the given PARAMS. */ +/* Creates and returns a new render_pager for rendering PT on the device + with the given PARAMS. */ struct render_pager * render_pager_create (const struct render_params *params, - const struct table_item *table_item) + const struct pivot_table *pt, + const size_t *layer_indexes) { - struct render_pager *p; - - p = xzalloc (sizeof *p); - p->params = params; - - /* Title. */ - add_text_page (p, table_item_get_title (table_item)); - - /* Body. */ - render_pager_add_table (p, table_ref (table_item_get_table (table_item))); - - /* Caption. */ - add_text_page (p, table_item_get_caption (table_item)); + if (!layer_indexes) + layer_indexes = pt->current_layer; + + struct table *title, *layers, *body, *caption, *footnotes; + pivot_output (pt, layer_indexes, params->printing, + &title, &layers, &body, &caption, &footnotes, NULL, NULL); + + /* Figure out the width of the body of the table. Use this to determine the + base scale. */ + struct render_page *body_page = render_page_create (params, body, 0); + int body_width = table_width (body_page, H); + double scale = 1.0; + if (body_width > params->size[H]) + { + if (pt->look->shrink_to_fit[H] && params->ops->scale) + scale = params->size[H] / (double) body_width; + else + { + struct render_break b; + render_break_init (&b, render_page_ref (body_page), H); + struct render_page *subpage + = render_break_next (&b, params->size[H]); + body_width = subpage ? subpage->cp[H][2 * subpage->n[H] + 1] : 0; + render_page_unref (subpage); + render_break_destroy (&b); + } + } - /* Footnotes. */ - add_footnote_page (p, table_item); + /* Create the pager. */ + struct render_pager *p = xmalloc (sizeof *p); + *p = (struct render_pager) { .params = params, .scale = scale }; + render_pager_add_table (p, title, body_width); + render_pager_add_table (p, layers, body_width); + p->pages[p->n_pages++] = body_page; + render_pager_add_table (p, caption, 0); + render_pager_add_table (p, footnotes, 0); + assert (p->n_pages <= sizeof p->pages / sizeof *p->pages); + + /* If we're shrinking tables to fit the page length, then adjust the scale + factor. + + XXX This will sometimes shrink more than needed, because adjusting the + scale factor allows for cells to be "wider", which means that sometimes + they won't break across as much vertical space, thus shrinking the table + vertically more than the scale would imply. Shrinking only as much as + necessary would require an iterative search. */ + if (pt->look->shrink_to_fit[V] && params->ops->scale) + { + int total_height = 0; + for (size_t i = 0; i < p->n_pages; i++) + total_height += table_width (p->pages[i], V); + if (total_height * p->scale >= params->size[V]) + p->scale *= params->size[V] / (double) total_height; + } render_pager_start_page (p); @@ -1489,13 +1582,10 @@ render_pager_destroy (struct render_pager *p) { if (p) { - size_t i; - render_break_destroy (&p->x_break); render_break_destroy (&p->y_break); - for (i = 0; i < p->n_pages; i++) + for (size_t i = 0; i < p->n_pages; i++) render_page_unref (p->pages[i]); - free (p->pages); free (p); } } @@ -1522,8 +1612,9 @@ render_pager_has_next (const struct render_pager *p_) render_pager_start_page (p); } else - render_break_init (&p->y_break, - render_break_next (&p->x_break, p->params->size[H]), V); + render_break_init ( + &p->y_break, render_break_next (&p->x_break, + p->params->size[H] / p->scale), V); } return true; } @@ -1537,18 +1628,23 @@ render_pager_has_next (const struct render_pager *p_) int render_pager_draw_next (struct render_pager *p, int space) { + if (p->scale != 1.0) + { + p->params->ops->scale (p->params->aux, p->scale); + space /= p->scale; + } + int ofs[TABLE_N_AXES] = { 0, 0 }; size_t start_page = SIZE_MAX; while (render_pager_has_next (p)) { - struct render_page *page; - if (start_page == p->cur_page) break; start_page = p->cur_page; - page = render_break_next (&p->y_break, space - ofs[V]); + struct render_page *page + = render_break_next (&p->y_break, space - ofs[V]); if (!page) break; @@ -1556,6 +1652,10 @@ render_pager_draw_next (struct render_pager *p, int space) ofs[V] += render_page_get_size (page, V); render_page_unref (page); } + + if (p->scale != 1.0) + ofs[V] *= p->scale; + return ofs[V]; } @@ -1575,11 +1675,10 @@ render_pager_draw_region (const struct render_pager *p, { int ofs[TABLE_N_AXES] = { 0, 0 }; int clip[TABLE_N_AXES][2]; - size_t i; clip[H][0] = x; clip[H][1] = x + w; - for (i = 0; i < p->n_pages; i++) + for (size_t i = 0; i < p->n_pages; i++) { const struct render_page *page = p->pages[i]; int size = render_page_get_size (page, V); @@ -1599,9 +1698,8 @@ int render_pager_get_size (const struct render_pager *p, enum table_axis axis) { int size = 0; - size_t i; - for (i = 0; i < p->n_pages; i++) + for (size_t i = 0; i < p->n_pages; i++) { int subsize = render_page_get_size (p->pages[i], axis); size = axis == H ? MAX (size, subsize) : size + subsize; @@ -1667,15 +1765,8 @@ static struct render_page * render_page_select (const struct render_page *page, enum table_axis axis, int z0, int p0, int z1, int p1) { - struct render_page_selection s; enum table_axis a = axis; enum table_axis b = !a; - struct render_page *subpage; - struct render_overflow *ro; - int *dcp, *scp; - int *jc; - int z; - /* Optimize case where all of PAGE is selected by just incrementing the reference count. */ @@ -1688,10 +1779,20 @@ render_page_select (const struct render_page *page, enum table_axis axis, } /* Allocate subpage. */ - subpage = render_page_allocate (page->params, - table_select_slice ( - table_ref (page->table), - a, z0, z1, true)); + int trim[2] = { z0 - page->h[a][0], (page->n[a] - page->h[a][1]) - z1 }; + int n[TABLE_N_AXES] = { [H] = page->n[H], [V] = page->n[V] }; + n[a] -= trim[0] + trim[1]; + struct render_page *subpage = render_page_allocate__ ( + page->params, table_ref (page->table), n); + for (enum table_axis k = 0; k < TABLE_N_AXES; k++) + { + subpage->h[k][0] = page->h[k][0]; + subpage->h[k][1] = page->h[k][1]; + subpage->r[k][0] = page->r[k][0]; + subpage->r[k][1] = page->r[k][1]; + } + subpage->r[a][0] += trim[0]; + subpage->r[a][1] -= trim[1]; /* An edge is cut off if it was cut off in PAGE or if we're trimming pixels off that side of the page and there are no headers. */ @@ -1704,12 +1805,12 @@ render_page_select (const struct render_page *page, enum table_axis axis, subpage->is_edge_cutoff[b][1] = page->is_edge_cutoff[b][1]; /* Select join crossings from PAGE into subpage. */ - jc = subpage->join_crossing[a]; - for (z = 0; z < page->h[a][0]; z++) + int *jc = subpage->join_crossing[a]; + for (int z = 0; z < page->h[a][0]; z++) *jc++ = page->join_crossing[a][z]; - for (z = z0; z <= z1; z++) + for (int z = z0; z <= z1; z++) *jc++ = page->join_crossing[a][z]; - for (z = page->n[a] - page->h[a][1]; z < page->n[a]; z++) + for (int z = page->n[a] - page->h[a][1]; z < page->n[a]; z++) *jc++ = page->join_crossing[a][z]; assert (jc == &subpage->join_crossing[a][subpage->n[a] + 1]); @@ -1717,17 +1818,15 @@ render_page_select (const struct render_page *page, enum table_axis axis, (subpage->n[b] + 1) * sizeof **subpage->join_crossing); /* Select widths from PAGE into subpage. */ - scp = page->cp[a]; - dcp = subpage->cp[a]; + int *scp = page->cp[a]; + int *dcp = subpage->cp[a]; *dcp = 0; - for (z = 0; z <= rule_ofs (subpage->h[a][0]); z++, dcp++) + for (int z = 0; z <= rule_ofs (subpage->h[a][0]); z++, dcp++) { - if (z == 0 && subpage->is_edge_cutoff[a][0]) - dcp[1] = dcp[0]; - else - dcp[1] = dcp[0] + (scp[z + 1] - scp[z]); + int w = !z && subpage->is_edge_cutoff[a][0] ? 0 : scp[z + 1] - scp[z]; + dcp[1] = dcp[0] + w; } - for (z = cell_ofs (z0); z <= cell_ofs (z1 - 1); z++, dcp++) + for (int z = cell_ofs (z0); z <= cell_ofs (z1 - 1); z++, dcp++) { dcp[1] = dcp[0] + (scp[z + 1] - scp[z]); if (z == cell_ofs (z0)) @@ -1739,7 +1838,7 @@ render_page_select (const struct render_page *page, enum table_axis axis, if (z == cell_ofs (z1 - 1)) dcp[1] -= p1; } - for (z = rule_ofs_r (page, a, subpage->h[a][1]); + for (int z = rule_ofs_r (page, a, subpage->h[a][1]); z <= rule_ofs_r (page, a, 0); z++, dcp++) { if (z == rule_ofs_r (page, a, 0) && subpage->is_edge_cutoff[a][1]) @@ -1749,36 +1848,35 @@ render_page_select (const struct render_page *page, enum table_axis axis, } assert (dcp == &subpage->cp[a][2 * subpage->n[a] + 1]); - for (z = 0; z < page->n[b] * 2 + 2; z++) + for (int z = 0; z < page->n[b] * 2 + 2; z++) subpage->cp[b][z] = page->cp[b][z]; /* Add new overflows. */ - s.page = page; - s.a = a; - s.b = b; - s.z0 = z0; - s.z1 = z1; - s.p0 = p0; - s.p1 = p1; - s.subpage = subpage; + struct render_page_selection s = { + .page = page, + .a = a, + .b = b, + .z0 = z0, + .z1 = z1, + .p0 = p0, + .p1 = p1, + .subpage = subpage, + }; if (!page->h[a][0] || z0 > page->h[a][0] || p0) - for (z = 0; z < page->n[b]; ) + for (int z = 0; z < page->n[b];) { - struct table_cell cell; int d[TABLE_N_AXES]; - bool overflow0; - bool overflow1; - d[a] = z0; d[b] = z; - table_get_cell (page->table, d[H], d[V], &cell); - overflow0 = p0 || cell.d[a][0] < z0; - overflow1 = cell.d[a][1] > z1 || (cell.d[a][1] == z1 && p1); + struct table_cell cell; + render_get_cell (page, d[H], d[V], &cell); + bool overflow0 = p0 || cell.d[a][0] < z0; + bool overflow1 = cell.d[a][1] > z1 || (cell.d[a][1] == z1 && p1); if (overflow0 || overflow1) { - ro = insert_overflow (&s, &cell); + struct render_overflow *ro = insert_overflow (&s, &cell); if (overflow0) { @@ -1798,30 +1896,29 @@ render_page_select (const struct render_page *page, enum table_axis axis, } } z = cell.d[b][1]; - table_cell_free (&cell); } if (!page->h[a][1] || z1 < page->n[a] - page->h[a][1] || p1) - for (z = 0; z < page->n[b]; ) + for (int z = 0; z < page->n[b];) { - struct table_cell cell; int d[TABLE_N_AXES]; - d[a] = z1 - 1; d[b] = z; - table_get_cell (page->table, d[H], d[V], &cell); + + struct table_cell cell; + render_get_cell (page, d[H], d[V], &cell); if ((cell.d[a][1] > z1 || (cell.d[a][1] == z1 && p1)) && find_overflow_for_cell (&s, &cell) == NULL) { - ro = insert_overflow (&s, &cell); + struct render_overflow *ro = insert_overflow (&s, &cell); ro->overflow[a][1] += p1 + axis_width (page, a, cell_ofs (z1), cell_ofs (cell.d[a][1])); } z = cell.d[b][1]; - table_cell_free (&cell); } /* Copy overflows from PAGE into subpage. */ + struct render_overflow *ro; HMAP_FOR_EACH (ro, struct render_overflow, node, &page->overflows) { struct table_cell cell; @@ -1830,7 +1927,6 @@ render_page_select (const struct render_page *page, enum table_axis axis, if (cell.d[a][1] > z0 && cell.d[a][0] < z1 && find_overflow_for_cell (&s, &cell) == NULL) insert_overflow (&s, &cell); - table_cell_free (&cell); } return subpage; @@ -1879,15 +1975,13 @@ static struct render_overflow * insert_overflow (struct render_page_selection *s, const struct table_cell *cell) { - const struct render_overflow *old; - struct render_overflow *of; - - of = xzalloc (sizeof *of); + struct render_overflow *of = XZALLOC (struct render_overflow); cell_to_subpage (s, cell, of->d); hmap_insert (&s->subpage->overflows, &of->node, hash_cell (of->d[H], of->d[V])); - old = find_overflow (s->page, cell->d[H][0], cell->d[V][0]); + const struct render_overflow *old + = find_overflow (s->page, cell->d[H][0], cell->d[V][0]); if (old != NULL) memcpy (of->overflow, old->overflow, sizeof of->overflow);