#include <stdlib.h>
-#include "output/pivot-table.h"
+#include "output/pivot-output.h"
#include "data/settings.h"
#include "libpspp/assertion.h"
#include "libpspp/pool.h"
-#include "output/table.h"
-#include "output/page-eject-item.h"
-#include "output/table-item.h"
-#include "output/text-item.h"
+#include "output/output-item.h"
+#include "output/pivot-table.h"
#include "output/table-provider.h"
+#include "output/table.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
#define H TABLE_HORZ
#define V TABLE_VERT
+size_t *
+pivot_output_next_layer (const struct pivot_table *pt, size_t *indexes,
+ bool print)
+{
+ const struct pivot_axis *layer_axis = &pt->axes[PIVOT_AXIS_LAYER];
+ if (print && pt->look->print_all_layers)
+ return pivot_axis_iterator_next (indexes, layer_axis);
+ else if (!indexes)
+ {
+ size_t size = layer_axis->n_dimensions * sizeof *pt->current_layer;
+ return size ? xmemdup (pt->current_layer, size) : xmalloc (1);
+ }
+ else
+ {
+ free (indexes);
+ return NULL;
+ }
+}
+
static const struct pivot_category *
find_category (const struct pivot_dimension *d, int dim_index,
const size_t *indexes, int row_ofs)
for (const struct pivot_category *c = d->presentation_leaves[index];
c; c = c->parent)
{
- /* A category can covert multiple rows. Only return the category for its
+ /* A category can cover multiple rows. Only return the category for its
top row. */
if (row_ofs == c->extra_depth)
return c;
static void
fill_cell (struct table *t, int x1, int y1, int x2, int y2,
- 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,
+ int style_idx, const struct pivot_value *value,
bool rotate_label)
{
+ int options = style_idx << TAB_STYLE_SHIFT;
+ if (rotate_label)
+ options |= TAB_ROTATE;
- struct string s = DS_EMPTY_INITIALIZER;
- int opts = style_idx << TAB_STYLE_SHIFT;
- if (value)
- {
- bool numeric = pivot_value_format_body (value, show_values,
- show_variables, &s);
- if (numeric)
- opts |= TAB_NUMERIC;
- if (value->font_style && value->font_style->markup)
- opts |= TAB_MARKUP;
- if (rotate_label)
- opts |= TAB_ROTATE;
- }
- table_joint_text (t, x1, y1, x2, y2, opts, ds_cstr (&s));
- ds_destroy (&s);
-
- if (value)
- {
- if (value->cell_style || value->font_style || rotate_label)
- table_add_style (t, x1, y1,
- table_area_style_override (t->container, style,
- value->cell_style,
- value->font_style,
- rotate_label));
-
- for (size_t i = 0; i < value->n_footnotes; i++)
- {
- 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);
- }
+ table_put (t, x1, y1, x2, y2, options, value);
}
-static struct table_item_text *
-pivot_value_to_table_item_text (const struct pivot_value *value,
- const struct table_area_style *area,
- struct footnote **footnotes,
- enum settings_value_show show_values,
- enum settings_value_show show_variables)
+static void
+fill_cell_owned (struct table *t, int x1, int y1, int x2, int y2,
+ int style_idx, struct string *s, bool rotate_label)
{
- if (!value)
- return NULL;
-
- struct string s = DS_EMPTY_INITIALIZER;
- pivot_value_format_body (value, show_values, show_variables, &s);
-
- struct table_item_text *text = xmalloc (sizeof *text);
- *text = (struct table_item_text) {
- .content = ds_steal_cstr (&s),
- .footnotes = xnmalloc (value->n_footnotes, sizeof *text->footnotes),
- .style = table_area_style_override (
- NULL, area, value->cell_style, value->font_style, false),
- };
-
- for (size_t i = 0; i < value->n_footnotes; i++)
- {
- struct footnote *f = footnotes[value->footnotes[i]->idx];
- if (f)
- text->footnotes[text->n_footnotes++] = f;
- }
+ int options = style_idx << TAB_STYLE_SHIFT;
+ if (rotate_label)
+ options |= TAB_ROTATE;
- return text;
+ table_put_owned (t, x1, y1, x2, y2, options,
+ pivot_value_new_user_text_nocopy (ds_steal_cstr (s)));
}
static int
headings. */
static void
compose_headings (struct table *t,
- const struct pivot_axis *a_axis, enum table_axis a,
- const struct pivot_axis *b_axis,
+ const struct pivot_axis *h_axis, enum table_axis h,
+ const struct pivot_axis *v_axis,
const struct table_border_style *borders,
enum pivot_border dim_col_horz,
enum pivot_border dim_col_vert,
enum pivot_border cat_col_horz,
enum pivot_border cat_col_vert,
const size_t *column_enumeration, size_t n_columns,
- 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,
bool rotate_inner_labels, bool rotate_outer_labels)
{
- enum table_axis b = !a;
- int b_size = a_axis->label_depth;
- int a_ofs = b_axis->label_depth;
+ const enum table_axis v = !h;
+ const int v_size = h_axis->label_depth;
+ const int h_ofs = v_axis->label_depth;
- if (!a_axis->n_dimensions || !n_columns || !b_size)
+ if (!h_axis->n_dimensions || !n_columns || !v_size)
return;
- const int stride = MAX (1, a_axis->n_dimensions);
+ const int stride = MAX (1, h_axis->n_dimensions);
/* Below, we're going to iterate through the dimensions. Each dimension
occupies one or more rows in the heading. 'top_row' is the top row of
|aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3|
+-----+-----+-----+-----+-----+-----+-----+-----+-----+
*/
- bool *vrules = xzalloc (n_columns + 1);
+ bool *vrules = XCALLOC (n_columns + 1, bool);
vrules[0] = vrules[n_columns] = true;
- for (int dim_index = a_axis->n_dimensions; --dim_index >= 0; )
+ for (int dim_index = h_axis->n_dimensions; --dim_index >= 0; )
{
- const struct pivot_dimension *d = a_axis->dimensions[dim_index];
+ const struct pivot_dimension *d = h_axis->dimensions[dim_index];
if (d->hide_all_labels)
continue;
int y1 = top_row + row_ofs;
int y2 = top_row + row_ofs + c->extra_depth + 1;
bool is_outer_row = y1 == 0;
- bool is_inner_row = y2 == b_size;
+ bool is_inner_row = y2 == v_size;
if (pivot_category_is_leaf (c) || c->show_label)
{
int bb[TABLE_N_AXES][2];
- bb[a][0] = x1 + a_ofs;
- bb[a][1] = x2 + a_ofs - 1;
- bb[b][0] = y1;
- bb[b][1] = y2 - 1;
+ bb[h][0] = x1 + h_ofs;
+ bb[h][1] = x2 + h_ofs - 1;
+ bb[v][0] = y1;
+ bb[v][1] = y2 - 1;
bool rotate = ((rotate_inner_labels && is_inner_row)
|| (rotate_outer_labels && is_outer_row));
fill_cell (t, bb[H][0], bb[V][0], bb[H][1], bb[V][1],
- label_style, label_style_idx, c->name, footnotes,
- show_values, show_variables, rotate);
+ label_style_idx, c->name, rotate);
/* Draw all the vertical lines in our running example, other
than the far left and far right ones. Only the ones that
+-----+-----+-----+-----+-----+-----+-----+-----+-----+
*/
enum pivot_border style
- = (y1 == b_size - 1 ? cat_col_vert : dim_col_vert);
+ = (y1 == v_size - 1 ? cat_col_vert : dim_col_vert);
if (!vrules[x2])
{
- draw_line (t, borders, style, b, x2 + a_ofs, y1,
- t->n[b] - 1);
+ draw_line (t, borders, style, v, x2 + h_ofs, y1,
+ t->n[v] - 1);
vrules[x2] = true;
}
if (!vrules[x1])
{
- draw_line (t, borders, style, b, x1 + a_ofs, y1,
- t->n[b] - 1);
+ draw_line (t, borders, style, v, x1 + h_ofs, y1,
+ t->n[v] - 1);
vrules[x1] = true;
}
}
+-----+-----+-----+-----+-----+-----+-----+-----+-----+
*/
if (c->parent && c->parent->show_label)
- draw_line (t, borders, cat_col_horz, a, y1,
- x1 + a_ofs, x2 + a_ofs - 1);
+ draw_line (t, borders, cat_col_horz, h, y1,
+ x1 + h_ofs, x2 + h_ofs - 1);
x1 = x2;
}
}
- if (d->root->show_label_in_corner && a_ofs > 0)
+ if (d->root->show_label_in_corner && h_ofs > 0)
{
int bb[TABLE_N_AXES][2];
- bb[a][0] = 0;
- bb[a][1] = a_ofs - 1;
- bb[b][0] = top_row;
- bb[b][1] = top_row + d->label_depth - 1;
+ bb[h][0] = 0;
+ bb[h][1] = h_ofs - 1;
+ bb[v][0] = top_row;
+ bb[v][1] = top_row + d->label_depth - 1;
fill_cell (t, bb[H][0], bb[V][0], bb[H][1], bb[V][1],
- corner_style, PIVOT_AREA_CORNER, d->root->name, footnotes,
- show_values, show_variables, false);
+ PIVOT_AREA_CORNER, d->root->name, false);
}
/* Draw the horizontal line between dimensions, e.g. the ===== line here:
|aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3|aaaa1|aaaa2|aaaa3| _|
+-----+-----+-----+-----+-----+-----+-----+-----+-----+
*/
- if (dim_index != a_axis->n_dimensions - 1)
- draw_line (t, borders, dim_col_horz, a, top_row, a_ofs,
- t->n[a] - 1);
+ if (dim_index != h_axis->n_dimensions - 1)
+ draw_line (t, borders, dim_col_horz, h, top_row, h_ofs,
+ t->n[h] - 1);
top_row += d->label_depth;
}
free (vrules);
}
+static struct table *
+create_aux_table (const struct pivot_table *pt, int nc, int nr,
+ int style_idx)
+{
+ struct table *table = table_create (nc, nr, 0, 0, 0, 0);
+ table->styles[style_idx] = table_area_style_override (
+ table->container, &pt->look->areas[style_idx], NULL, NULL, false);
+ return table;
+}
+
+
static void
-pivot_table_submit_layer (const struct pivot_table *pt,
- const size_t *layer_indexes)
+add_references (const struct pivot_table *pt, const struct table *table,
+ bool *refs, size_t *n_refs)
+{
+ if (!table)
+ return;
+
+ for (int y = 0; y < table->n[V]; y++)
+ for (int x = 0; x < table->n[H]; )
+ {
+ struct table_cell cell;
+ table_get_cell (table, x, y, &cell);
+
+ if (x == cell.d[H][0] && y == cell.d[V][0])
+ {
+ const struct pivot_value_ex *ex = pivot_value_ex (cell.value);
+ for (size_t i = 0; i < ex->n_footnotes; i++)
+ {
+ size_t idx = ex->footnote_indexes[i];
+ assert (idx < pt->n_footnotes);
+
+ if (!refs[idx] && pt->footnotes[idx]->show)
+ {
+ refs[idx] = true;
+ (*n_refs)++;
+ }
+ }
+ }
+
+ x = cell.d[TABLE_HORZ][1];
+ }
+}
+
+static struct pivot_footnote **
+collect_footnotes (const struct pivot_table *pt,
+ const struct table *title,
+ const struct table *layers,
+ const struct table *body,
+ const struct table *caption,
+ size_t *n_footnotesp)
+{
+ if (!pt->n_footnotes)
+ {
+ *n_footnotesp = 0;
+ return NULL;
+ }
+
+ bool *refs = XCALLOC (pt->n_footnotes, bool);
+ size_t n_refs = 0;
+ add_references (pt, title, refs, &n_refs);
+ add_references (pt, layers, refs, &n_refs);
+ add_references (pt, body, refs, &n_refs);
+ add_references (pt, caption, refs, &n_refs);
+
+ struct pivot_footnote **footnotes = xnmalloc (n_refs, sizeof *footnotes);
+ size_t n_footnotes = 0;
+ for (size_t i = 0; i < pt->n_footnotes; i++)
+ if (refs[i])
+ footnotes[n_footnotes++] = pt->footnotes[i];
+ assert (n_footnotes == n_refs);
+
+ free (refs);
+
+ *n_footnotesp = n_footnotes;
+ return footnotes;
+}
+
+void
+pivot_output (const struct pivot_table *pt,
+ const size_t *layer_indexes,
+ bool printing UNUSED,
+ struct table **titlep,
+ struct table **layersp,
+ struct table **bodyp,
+ struct table **captionp,
+ struct table **footnotesp,
+ struct pivot_footnote ***fp, size_t *nfp)
{
const size_t *pindexes[PIVOT_N_AXES]
= { [PIVOT_AXIS_LAYER] = layer_indexes };
- size_t body[TABLE_N_AXES];
+ size_t data[TABLE_N_AXES];
size_t *column_enumeration = pivot_table_enumerate_axis (
- pt, PIVOT_AXIS_COLUMN, layer_indexes, pt->look->omit_empty, &body[H]);
+ pt, PIVOT_AXIS_COLUMN, layer_indexes, pt->look->omit_empty, &data[H]);
size_t *row_enumeration = pivot_table_enumerate_axis (
- pt, PIVOT_AXIS_ROW, layer_indexes, pt->look->omit_empty, &body[V]);
+ pt, PIVOT_AXIS_ROW, layer_indexes, pt->look->omit_empty, &data[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 = table_create (body[H] + stub[H],
- body[V] + stub[V],
- stub[H], 0, stub[V], 0);
-
+ struct table *body = table_create (data[H] + stub[H],
+ data[V] + stub[V],
+ stub[H], 0, stub[V], 0);
for (size_t i = 0; i < PIVOT_N_AREAS; i++)
- table->styles[i] = table_area_style_override (
- table->container, &pt->look->areas[i], NULL, NULL, false);
+ body->styles[i] = table_area_style_override (
+ body->container, &pt->look->areas[i], NULL, NULL, false);
+
+ struct table_border_style borders[PIVOT_N_BORDERS];
+ memcpy (borders, pt->look->borders, sizeof borders);
+ if (!printing && pt->show_grid_lines)
+ for (int b = 0; b < PIVOT_N_BORDERS; b++)
+ if (borders[b].stroke == TABLE_STROKE_NONE)
+ borders[b].stroke = TABLE_STROKE_DASHED;
for (size_t i = 0; i < PIVOT_N_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];
- out->alpha = in->color.alpha;
- out->r = in->color.r;
- out->g = in->color.g;
- out->b = in->color.b;
+ body->rule_colors[i] = pool_alloc (body->container,
+ sizeof *body->rule_colors[i]);
+ *body->rule_colors[i] = in->color;
}
- struct footnote **footnotes = XCALLOC (pt->n_footnotes, struct footnote *);
- for (size_t i = 0; i < pt->n_footnotes; i++)
- {
- 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,
- table_area_style_override (table->container,
- &pt->look->areas[PIVOT_AREA_FOOTER],
- pf->content->cell_style,
- pf->content->font_style,
- false));
- free (marker);
- free (content);
- }
-
- compose_headings (table,
+ compose_headings (body,
&pt->axes[PIVOT_AXIS_COLUMN], H, &pt->axes[PIVOT_AXIS_ROW],
- pt->look->borders,
+ 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->look->areas[PIVOT_AREA_COLUMN_LABELS],
+ column_enumeration, data[H],
PIVOT_AREA_COLUMN_LABELS,
- &pt->look->areas[PIVOT_AREA_CORNER], footnotes,
- pt->show_values, pt->show_variables,
pt->rotate_outer_row_labels, false);
- compose_headings (table,
+ compose_headings (body,
&pt->axes[PIVOT_AXIS_ROW], V, &pt->axes[PIVOT_AXIS_COLUMN],
- pt->look->borders,
+ 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->look->areas[PIVOT_AREA_ROW_LABELS],
+ row_enumeration, data[V],
PIVOT_AREA_ROW_LABELS,
- &pt->look->areas[PIVOT_AREA_CORNER], footnotes,
- pt->show_values, pt->show_variables,
false, pt->rotate_inner_column_labels);
size_t *dindexes = XCALLOC (pt->n_dimensions, size_t);
{
pivot_table_convert_indexes_ptod (pt, pindexes, dindexes);
const struct pivot_value *value = pivot_table_get (pt, dindexes);
- fill_cell (table,
- x + stub[H], y + stub[V],
- x + stub[H], y + stub[V],
- &pt->look->areas[PIVOT_AREA_DATA], PIVOT_AREA_DATA,
- value, footnotes,
- pt->show_values, pt->show_variables, false);
+ fill_cell (body, x + stub[H], y + stub[V], x + stub[H], y + stub[V],
+ PIVOT_AREA_DATA, value, false);
x++;
}
if ((pt->corner_text || !pt->look->row_labels_in_corner)
&& stub[H] && stub[V])
- fill_cell (table, 0, 0, stub[H] - 1, stub[V] - 1,
- &pt->look->areas[PIVOT_AREA_CORNER], PIVOT_AREA_CORNER,
- pt->corner_text, footnotes,
- pt->show_values, pt->show_variables, false);
+ fill_cell (body, 0, 0, stub[H] - 1, stub[V] - 1,
+ PIVOT_AREA_CORNER, pt->corner_text, false);
- if (table->n[H] && table->n[V])
+ if (body->n[H] && body->n[V])
{
table_hline (
- table, get_table_rule (pt->look->borders, PIVOT_BORDER_INNER_TOP),
- 0, table->n[H] - 1, 0);
+ body, get_table_rule (borders, PIVOT_BORDER_INNER_TOP),
+ 0, body->n[H] - 1, 0);
table_hline (
- table, get_table_rule (pt->look->borders, PIVOT_BORDER_INNER_BOTTOM),
- 0, table->n[H] - 1, table->n[V]);
+ body, get_table_rule (borders, PIVOT_BORDER_INNER_BOTTOM),
+ 0, body->n[H] - 1, body->n[V]);
table_vline (
- table, get_table_rule (pt->look->borders, PIVOT_BORDER_INNER_LEFT),
- 0, 0, table->n[V] - 1);
+ body, get_table_rule (borders, PIVOT_BORDER_INNER_LEFT),
+ 0, 0, body->n[V] - 1);
table_vline (
- table, get_table_rule (pt->look->borders, PIVOT_BORDER_INNER_RIGHT),
- table->n[H], 0, table->n[V] - 1);
+ body, get_table_rule (borders, PIVOT_BORDER_INNER_RIGHT),
+ body->n[H], 0, body->n[V] - 1);
if (stub[V])
table_hline (
- table, get_table_rule (pt->look->borders, PIVOT_BORDER_DATA_TOP),
- 0, table->n[H] - 1, stub[V]);
+ body, get_table_rule (borders, PIVOT_BORDER_DATA_TOP),
+ 0, body->n[H] - 1, stub[V]);
if (stub[H])
table_vline (
- table, get_table_rule (pt->look->borders, PIVOT_BORDER_DATA_LEFT),
- stub[H], 0, table->n[V] - 1);
+ body, get_table_rule (borders, PIVOT_BORDER_DATA_LEFT),
+ stub[H], 0, body->n[V] - 1);
}
free (column_enumeration);
free (row_enumeration);
- struct table_item *ti = table_item_create (table, NULL, NULL, pt->notes);
-
- if (pt->title && pt->show_title)
+ /* Title. */
+ struct table *title;
+ if (pt->title && pt->show_title && titlep)
{
- struct table_item_text *title = pivot_value_to_table_item_text (
- 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);
+ title = create_aux_table (pt, 1, 1, PIVOT_AREA_TITLE);
+ fill_cell (title, 0, 0, 0, 0, PIVOT_AREA_TITLE, pt->title, false);
}
+ else
+ title = NULL;
+ /* Layers. */
const struct pivot_axis *layer_axis = &pt->axes[PIVOT_AXIS_LAYER];
- struct table_item_layers *layers = NULL;
- for (size_t i = 0; i < layer_axis->n_dimensions; i++)
+ int n_layers = 0;
+ if (layersp)
+ for (size_t i = 0; i < layer_axis->n_dimensions; i++)
+ {
+ const struct pivot_dimension *d = layer_axis->dimensions[i];
+ if (d->n_leaves)
+ n_layers++;
+ }
+
+ struct table *layers;
+ if (n_layers > 0)
{
- const struct pivot_dimension *d = layer_axis->dimensions[i];
- if (d->n_leaves)
+ layers = create_aux_table (pt, 1, n_layers, PIVOT_AREA_LAYERS);
+ size_t y = n_layers - 1;
+ for (size_t i = 0; i < layer_axis->n_dimensions; i++)
{
- if (!layers)
- {
- layers = xzalloc (sizeof *layers);
- layers->style = table_area_style_override (
- NULL, &pt->look->areas[PIVOT_AREA_LAYERS], NULL, NULL, false);
- layers->layers = xnmalloc (layer_axis->n_dimensions,
- sizeof *layers->layers);
- }
+ const struct pivot_dimension *d = layer_axis->dimensions[i];
+ if (!d->n_leaves)
+ continue;
- const struct pivot_value *name
- = d->data_leaves[layer_indexes[i]]->name;
- struct table_item_layer *layer = &layers->layers[layers->n_layers++];
struct string s = DS_EMPTY_INITIALIZER;
- pivot_value_format_body (name, pt->show_values, pt->show_variables,
- &s);
- layer->content = ds_steal_cstr (&s);
- layer->n_footnotes = 0;
- layer->footnotes = xnmalloc (name->n_footnotes,
- sizeof *layer->footnotes);
- for (size_t i = 0; i < name->n_footnotes; i++)
- {
- struct footnote *f = footnotes[name->footnotes[i]->idx];
- if (f)
- layer->footnotes[layer->n_footnotes++] = f;
- }
+ pivot_value_format (d->data_leaves[layer_indexes[i]]->name, pt, &s);
+ fill_cell_owned (layers, 0, y, 0, y, PIVOT_AREA_LAYERS, &s, false);
+ y--;
}
}
- if (layers)
- {
- table_item_set_layers (ti, layers);
- table_item_layers_destroy (layers);
- }
+ else
+ layers = NULL;
- if (pt->caption && pt->show_caption)
+ /* Caption. */
+ struct table *caption;
+ if (pt->caption && pt->show_caption && captionp)
{
- struct table_item_text *caption = pivot_value_to_table_item_text (
- 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);
+ caption = create_aux_table (pt, 1, 1, PIVOT_AREA_CAPTION);
+ fill_cell (caption, 0, 0, 0, 0, PIVOT_AREA_CAPTION, pt->caption, false);
}
-
- free (footnotes);
- ti->pt = pivot_table_ref (pt);
-
- table_item_submit (ti);
-}
-
-void
-pivot_table_submit (struct pivot_table *pt)
-{
- pivot_table_assign_label_depth (CONST_CAST (struct pivot_table *, pt));
-
- int old_decimal = settings_get_decimal_char (FMT_COMMA);
- if (pt->decimal == '.' || pt->decimal == ',')
- settings_set_decimal_char (pt->decimal);
-
- if (pt->look->print_all_layers)
+ else
+ caption = NULL;
+
+ /* Footnotes. */
+ size_t nf;
+ struct pivot_footnote **f = collect_footnotes (pt, title, layers, body,
+ caption, &nf);
+ struct table *footnotes;
+ if (nf && footnotesp)
{
- size_t *layer_indexes;
+ footnotes = create_aux_table (pt, 1, nf, PIVOT_AREA_FOOTER);
- PIVOT_AXIS_FOR_EACH (layer_indexes, &pt->axes[PIVOT_AXIS_LAYER])
+ for (size_t i = 0; i < nf; i++)
{
- if (pt->look->paginate_layers)
- page_eject_item_submit (page_eject_item_create ());
- pivot_table_submit_layer (pt, layer_indexes);
+ struct string s = DS_EMPTY_INITIALIZER;
+ pivot_footnote_format_marker (f[i], pt, &s);
+ ds_put_cstr (&s, ". ");
+ pivot_value_format (f[i]->content, pt, &s);
+ fill_cell_owned (footnotes, 0, i, 0, i, PIVOT_AREA_FOOTER, &s,
+ false);
}
}
else
- pivot_table_submit_layer (pt, pt->current_layer);
-
- settings_set_decimal_char (old_decimal);
+ footnotes = NULL;
+
+ *titlep = title;
+ if (layersp)
+ *layersp = layers;
+ *bodyp = body;
+ if (captionp)
+ *captionp = caption;
+ if (footnotesp)
+ *footnotesp = footnotes;
+ if (fp)
+ {
+ *fp = f;
+ *nfp = nf;
+ }
+ else
+ free (f);
+}
- pivot_table_unref (pt);
+void
+pivot_table_submit (struct pivot_table *pt)
+{
+ output_item_submit (table_item_create (pt));
}
projects / pspp / blobdiff