From b3ba98d28e298c3ece86bb31790ffd6857a318d2 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 30 Jan 2023 09:54:09 -0800 Subject: [PATCH] Fix problem with category borders. --- src/output/pivot-output.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/output/pivot-output.c b/src/output/pivot-output.c index 464b5d950a..ca01968e8c 100644 --- a/src/output/pivot-output.c +++ b/src/output/pivot-output.c @@ -306,7 +306,7 @@ compose_headings (struct table *t, +-----+-----+-----+-----+-----+-----+-----+-----+-----+ */ enum pivot_border style - = (y1 == v_size - 1 ? cat_col_vert : dim_col_vert); + = (y1 == area[v][0] + v_size - 1 ? cat_col_vert : dim_col_vert); if (!vrules[x2]) { draw_line (t, style, v, x2 + h_ofs, y1, v_max); @@ -826,14 +826,8 @@ pivot_output_monolithic (const struct pivot_table *pt, t->n_borders = PIVOT_N_BORDERS; t->borders = pool_nmalloc (t->container, PIVOT_N_BORDERS, sizeof *t->borders); for (size_t i = 0; i < PIVOT_N_BORDERS; i++) - { - const struct table_border_style *src = &pt->look->borders[i]; - struct table_border_style *dst = &t->borders[i]; - *dst = (!printing && pt->show_grid_lines && src->stroke == TABLE_STROKE_NONE - ? (struct table_border_style) { .stroke = TABLE_STROKE_DASHED, - .color = CELL_COLOR_BLACK } - : *src); - } + t->borders[i] = resolve_border_style (pt->look, i, + printing && pt->show_grid_lines); int body[TABLE_N_AXES][2] = { [H] = { 0, n[H] - 1 }, -- 2.30.2