#include "libpspp/compiler.h"
#include "libpspp/pool.h"
#include "libpspp/str.h"
+#include "output/output-item.h"
#include "output/pivot-table.h"
-#include "output/table-item.h"
#include "output/table.h"
-#include "output/text-item.h"
#include "gl/xalloc.h"
= t->styles[(opt & TAB_STYLE_MASK) >> TAB_STYLE_SHIFT];
static const struct pivot_value empty_value = {
- .type = PIVOT_VALUE_TEXT,
.text = {
+ .type = PIVOT_VALUE_TEXT,
.local = (char *) "",
.c = (char *) "",
.id = (char *) "",
else
{
const struct pivot_value *v = cc ? cc : &empty_value;
+ const struct pivot_value_ex *ex = pivot_value_ex (v);
*cell = (struct table_cell) {
.d = { [H] = { x, x + 1 }, [V] = { y, y + 1 } },
.options = opt,
.value = v,
- .font_style = v->font_style ? v->font_style : &style->font_style,
- .cell_style = v->cell_style ? v->cell_style : &style->cell_style,
+ .font_style = ex->font_style ? ex->font_style : &style->font_style,
+ .cell_style = ex->cell_style ? ex->cell_style : &style->cell_style,
};
}