X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fpivot-output.c;h=8ca3601cfcbaf0882dbd903ad2fa47929712bcce;hb=75ac1e869e551495c403cf94a3a24dd0dfee98ef;hp=1325234f35c909a1973e00e804fa9adb93e09559;hpb=c8e1adf66ea2110fc8a3f489c864e5ea93105031;p=pspp diff --git a/src/output/pivot-output.c b/src/output/pivot-output.c index 1325234f35..8ca3601cfc 100644 --- a/src/output/pivot-output.c +++ b/src/output/pivot-output.c @@ -23,7 +23,6 @@ #include "data/settings.h" #include "libpspp/assertion.h" #include "libpspp/pool.h" -#include "output/tab.h" #include "output/table.h" #include "output/table-item.h" #include "output/text-item.h" @@ -54,19 +53,19 @@ find_category (const struct pivot_dimension *d, int dim_index, return NULL; } -static struct area_style * -area_style_override (struct pool *pool, - const struct area_style *in, - const struct cell_style *cell_, - const struct font_style *font_) +static struct table_area_style * +table_area_style_override (struct pool *pool, + const struct table_area_style *in, + const struct cell_style *cell_, + const struct font_style *font_) { const struct cell_style *cell = cell_ ? cell_ : &in->cell_style; const struct font_style *font = font_ ? font_ : &in->font_style; - struct area_style *out = (pool + struct table_area_style *out = (pool ? pool_alloc (pool, sizeof *out) : xmalloc (sizeof *out)); - *out = (struct area_style) { + *out = (struct table_area_style) { .cell_style.halign = cell->halign, .cell_style.valign = cell->valign, .cell_style.decimal_offset = cell->decimal_offset, @@ -92,7 +91,7 @@ area_style_override (struct pool *pool, static void fill_cell (struct table *t, int x1, int y1, int x2, int y2, - const struct area_style *style, int style_idx, + const struct table_area_style *style, int style_idx, const struct pivot_value *value, struct footnote **footnotes, enum settings_value_show show_values, enum settings_value_show show_variables, @@ -112,25 +111,33 @@ fill_cell (struct table *t, int x1, int y1, int x2, int y2, if (rotate_label) opts |= TAB_ROTATE; } - tab_joint_text (t, x1, y1, x2, y2, opts, ds_cstr (&s)); + table_joint_text (t, x1, y1, x2, y2, opts, ds_cstr (&s)); ds_destroy (&s); if (value) { if (value->cell_style || value->font_style) - tab_add_style (t, x1, y1, - area_style_override (t->container, style, - value->cell_style, - value->font_style)); + table_add_style (t, x1, y1, + table_area_style_override (t->container, style, + value->cell_style, + value->font_style)); for (size_t i = 0; i < value->n_footnotes; i++) - tab_add_footnote (t, x1, y1, footnotes[value->footnotes[i]->idx]); + { + struct footnote *f = footnotes[value->footnotes[i]->idx]; + if (f) + table_add_footnote (t, x1, y1, f); + } + + if (value->n_subscripts) + table_add_subscripts (t, x1, y1, + value->subscripts, value->n_subscripts); } } static struct table_item_text * pivot_value_to_table_item_text (const struct pivot_value *value, - const struct area_style *area, + const struct table_area_style *area, struct footnote **footnotes, enum settings_value_show show_values, enum settings_value_show show_variables) @@ -145,13 +152,16 @@ pivot_value_to_table_item_text (const struct pivot_value *value, *text = (struct table_item_text) { .content = ds_steal_cstr (&s), .footnotes = xnmalloc (value->n_footnotes, sizeof *text->footnotes), - .n_footnotes = value->n_footnotes, - .style = area_style_override ( + .style = table_area_style_override ( NULL, area, value->cell_style, value->font_style), }; for (size_t i = 0; i < value->n_footnotes; i++) - text->footnotes[i] = footnotes[value->footnotes[i]->idx]; + { + struct footnote *f = footnotes[value->footnotes[i]->idx]; + if (f) + text->footnotes[text->n_footnotes++] = f; + } return text; } @@ -170,9 +180,9 @@ draw_line (struct table *t, const struct table_border_style *styles, { int rule = get_table_rule (styles, style_idx); if (axis == H) - tab_hline (t, rule, b0, b1, a); + table_hline (t, rule, b0, b1, a); else - tab_vline (t, rule, a, b0, b1); + table_vline (t, rule, a, b0, b1); } static void @@ -185,8 +195,9 @@ compose_headings (struct table *t, enum pivot_border cat_col_horz, enum pivot_border cat_col_vert, const size_t *column_enumeration, size_t n_columns, - const struct area_style *label_style, int label_style_idx, - const struct area_style *corner_style, + const struct table_area_style *label_style, + int label_style_idx, + const struct table_area_style *corner_style, struct footnote **footnotes, enum settings_value_show show_values, enum settings_value_show show_variables, @@ -209,7 +220,7 @@ compose_headings (struct table *t, for (int row_ofs = 0; row_ofs < d->label_depth; row_ofs++) { - for (size_t x1 = 0; x1 < n_columns; ) + for (size_t x1 = 0; x1 < n_columns;) { const struct pivot_category *c = find_category ( d, dim_index, column_enumeration + x1 * stride, row_ofs); @@ -301,25 +312,25 @@ pivot_table_submit_layer (const struct pivot_table *pt, size_t body[TABLE_N_AXES]; size_t *column_enumeration = pivot_table_enumerate_axis ( - pt, PIVOT_AXIS_COLUMN, layer_indexes, pt->omit_empty, &body[H]); + pt, PIVOT_AXIS_COLUMN, layer_indexes, pt->look.omit_empty, &body[H]); size_t *row_enumeration = pivot_table_enumerate_axis ( - pt, PIVOT_AXIS_ROW, layer_indexes, pt->omit_empty, &body[V]); + pt, PIVOT_AXIS_ROW, layer_indexes, pt->look.omit_empty, &body[V]); int stub[TABLE_N_AXES] = { [H] = pt->axes[PIVOT_AXIS_ROW].label_depth, [V] = pt->axes[PIVOT_AXIS_COLUMN].label_depth, }; - struct table *table = tab_create (body[H] + stub[H], - body[V] + stub[V], - stub[H], 0, stub[V], 0); + struct table *table = table_create (body[H] + stub[H], + body[V] + stub[V], + stub[H], 0, stub[V], 0); for (size_t i = 0; i < PIVOT_N_AREAS; i++) - table->styles[i] = area_style_override (table->container, &pt->areas[i], - NULL, NULL); + table->styles[i] = table_area_style_override ( + table->container, &pt->look.areas[i], NULL, NULL); for (size_t i = 0; i < PIVOT_N_BORDERS; i++) { - const struct table_border_style *in = &pt->borders[i]; + const struct table_border_style *in = &pt->look.borders[i]; table->rule_colors[i] = pool_alloc (table->container, sizeof *table->rule_colors[i]); struct cell_color *out = table->rule_colors[i]; @@ -329,51 +340,57 @@ pivot_table_submit_layer (const struct pivot_table *pt, out->b = in->color.b; } - struct footnote **footnotes = xcalloc (pt->n_footnotes, sizeof *footnotes); + struct footnote **footnotes = XCALLOC (pt->n_footnotes, struct footnote *); for (size_t i = 0; i < pt->n_footnotes; i++) { - char *content = pivot_value_to_string ( - pt->footnotes[i]->content, pt->show_values, pt->show_variables); - char *marker = pivot_value_to_string ( - pt->footnotes[i]->marker, pt->show_values, pt->show_variables); - footnotes[i] = tab_create_footnote ( + const struct pivot_footnote *pf = pt->footnotes[i]; + + if (!pf->show) + continue; + + char *content = pivot_value_to_string (pf->content, pt->show_values, + pt->show_variables); + char *marker = pivot_value_to_string (pf->marker, pt->show_values, + pt->show_variables); + footnotes[i] = table_create_footnote ( table, i, content, marker, - area_style_override (table->container, &pt->areas[PIVOT_AREA_FOOTER], - pt->footnotes[i]->content->cell_style, - pt->footnotes[i]->content->font_style)); + table_area_style_override (table->container, + &pt->look.areas[PIVOT_AREA_FOOTER], + pf->content->cell_style, + pf->content->font_style)); free (marker); free (content); } compose_headings (table, &pt->axes[PIVOT_AXIS_COLUMN], H, &pt->axes[PIVOT_AXIS_ROW], - pt->borders, + pt->look.borders, PIVOT_BORDER_DIM_COL_HORZ, PIVOT_BORDER_DIM_COL_VERT, PIVOT_BORDER_CAT_COL_HORZ, PIVOT_BORDER_CAT_COL_VERT, column_enumeration, body[H], - &pt->areas[PIVOT_AREA_COLUMN_LABELS], + &pt->look.areas[PIVOT_AREA_COLUMN_LABELS], PIVOT_AREA_COLUMN_LABELS, - &pt->areas[PIVOT_AREA_CORNER], footnotes, + &pt->look.areas[PIVOT_AREA_CORNER], footnotes, pt->show_values, pt->show_variables, pt->rotate_inner_column_labels, false); compose_headings (table, &pt->axes[PIVOT_AXIS_ROW], V, &pt->axes[PIVOT_AXIS_COLUMN], - pt->borders, + pt->look.borders, PIVOT_BORDER_DIM_ROW_VERT, PIVOT_BORDER_DIM_ROW_HORZ, PIVOT_BORDER_CAT_ROW_VERT, PIVOT_BORDER_CAT_ROW_HORZ, row_enumeration, body[V], - &pt->areas[PIVOT_AREA_ROW_LABELS], + &pt->look.areas[PIVOT_AREA_ROW_LABELS], PIVOT_AREA_ROW_LABELS, - &pt->areas[PIVOT_AREA_CORNER], footnotes, + &pt->look.areas[PIVOT_AREA_CORNER], footnotes, pt->show_values, pt->show_variables, false, pt->rotate_outer_row_labels); - size_t *dindexes = xcalloc (pt->n_dimensions, sizeof *dindexes); + size_t *dindexes = XCALLOC (pt->n_dimensions, size_t); size_t y = 0; PIVOT_ENUMERATION_FOR_EACH (pindexes[PIVOT_AXIS_ROW], row_enumeration, &pt->axes[PIVOT_AXIS_ROW]) @@ -388,7 +405,7 @@ pivot_table_submit_layer (const struct pivot_table *pt, fill_cell (table, x + stub[H], y + stub[V], x + stub[H], y + stub[V], - &pt->areas[PIVOT_AREA_DATA], PIVOT_AREA_DATA, + &pt->look.areas[PIVOT_AREA_DATA], PIVOT_AREA_DATA, value, footnotes, pt->show_values, pt->show_variables, false); @@ -401,32 +418,32 @@ pivot_table_submit_layer (const struct pivot_table *pt, if (pt->corner_text && stub[H] && stub[V]) fill_cell (table, 0, 0, stub[H] - 1, stub[V] - 1, - &pt->areas[PIVOT_AREA_CORNER], PIVOT_AREA_CORNER, + &pt->look.areas[PIVOT_AREA_CORNER], PIVOT_AREA_CORNER, pt->corner_text, footnotes, pt->show_values, pt->show_variables, false); if (table_nc (table) && table_nr (table)) { - tab_hline ( - table, get_table_rule (pt->borders, PIVOT_BORDER_INNER_TOP), + table_hline ( + table, get_table_rule (pt->look.borders, PIVOT_BORDER_INNER_TOP), 0, table_nc (table) - 1, 0); - tab_hline ( - table, get_table_rule (pt->borders, PIVOT_BORDER_INNER_BOTTOM), + table_hline ( + table, get_table_rule (pt->look.borders, PIVOT_BORDER_INNER_BOTTOM), 0, table_nc (table) - 1, table_nr (table)); - tab_vline ( - table, get_table_rule (pt->borders, PIVOT_BORDER_INNER_LEFT), + table_vline ( + table, get_table_rule (pt->look.borders, PIVOT_BORDER_INNER_LEFT), 0, 0, table_nr (table) - 1); - tab_vline ( - table, get_table_rule (pt->borders, PIVOT_BORDER_INNER_RIGHT), + table_vline ( + table, get_table_rule (pt->look.borders, PIVOT_BORDER_INNER_RIGHT), table_nc (table), 0, table_nr (table) - 1); if (stub[V]) - tab_hline ( - table, get_table_rule (pt->borders, PIVOT_BORDER_DATA_TOP), + table_hline ( + table, get_table_rule (pt->look.borders, PIVOT_BORDER_DATA_TOP), 0, table_nc (table) - 1, stub[V]); if (stub[H]) - tab_vline ( - table, get_table_rule (pt->borders, PIVOT_BORDER_DATA_LEFT), + table_vline ( + table, get_table_rule (pt->look.borders, PIVOT_BORDER_DATA_LEFT), stub[H], 0, table_nr (table) - 1); } @@ -438,7 +455,7 @@ pivot_table_submit_layer (const struct pivot_table *pt, if (pt->title) { struct table_item_text *title = pivot_value_to_table_item_text ( - pt->title, &pt->areas[PIVOT_AREA_TITLE], footnotes, + pt->title, &pt->look.areas[PIVOT_AREA_TITLE], footnotes, pt->show_values, pt->show_variables); table_item_set_title (ti, title); table_item_text_destroy (title); @@ -454,8 +471,8 @@ pivot_table_submit_layer (const struct pivot_table *pt, if (!layers) { layers = xzalloc (sizeof *layers); - layers->style = area_style_override ( - NULL, &pt->areas[PIVOT_AREA_LAYERS], NULL, NULL); + layers->style = table_area_style_override ( + NULL, &pt->look.areas[PIVOT_AREA_LAYERS], NULL, NULL); layers->layers = xnmalloc (layer_axis->n_dimensions, sizeof *layers->layers); } @@ -467,11 +484,15 @@ pivot_table_submit_layer (const struct pivot_table *pt, pivot_value_format_body (name, pt->show_values, pt->show_variables, &s); layer->content = ds_steal_cstr (&s); - layer->n_footnotes = name->n_footnotes; - layer->footnotes = xnmalloc (layer->n_footnotes, + layer->n_footnotes = 0; + layer->footnotes = xnmalloc (name->n_footnotes, sizeof *layer->footnotes); for (size_t i = 0; i < name->n_footnotes; i++) - layer->footnotes[i] = footnotes[name->footnotes[i]->idx]; + { + struct footnote *f = footnotes[name->footnotes[i]->idx]; + if (f) + layer->footnotes[layer->n_footnotes++] = f; + } } } if (layers) @@ -480,16 +501,18 @@ pivot_table_submit_layer (const struct pivot_table *pt, table_item_layers_destroy (layers); } - if (pt->caption) + if (pt->caption && pt->show_caption) { struct table_item_text *caption = pivot_value_to_table_item_text ( - pt->caption, &pt->areas[PIVOT_AREA_CAPTION], footnotes, + pt->caption, &pt->look.areas[PIVOT_AREA_CAPTION], footnotes, pt->show_values, pt->show_variables); table_item_set_caption (ti, caption); table_item_text_destroy (caption); } free (footnotes); + ti->pt = pivot_table_ref (pt); + table_item_submit (ti); } @@ -502,13 +525,13 @@ pivot_table_submit (struct pivot_table *pt) if (pt->decimal == '.' || pt->decimal == ',') settings_set_decimal_char (pt->decimal); - if (pt->print_all_layers) + if (pt->look.print_all_layers) { size_t *layer_indexes; PIVOT_AXIS_FOR_EACH (layer_indexes, &pt->axes[PIVOT_AXIS_LAYER]) { - if (pt->paginate_layers) + if (pt->look.paginate_layers) text_item_submit (text_item_create (TEXT_ITEM_EJECT_PAGE, "")); pivot_table_submit_layer (pt, layer_indexes); }