/* PSPP - a program for statistical analysis.
- Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2011, 2013 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
static struct table_casereader *
table_casereader_cast (const struct table *table)
{
- assert (table->class == &table_casereader_class);
+ assert (table->klass == &table_casereader_class);
return UP_CAST (table, struct table_casereader, table);
}
cell->d[TABLE_HORZ][1] = x + 1;
cell->d[TABLE_VERT][0] = y;
cell->d[TABLE_VERT][1] = y + 1;
- cell->options = TAB_RIGHT;
+ cell->contents = &cell->inline_contents;
+ cell->n_contents = 1;
+ cell->inline_contents.options = TAB_RIGHT;
+ cell->inline_contents.table = NULL;
if (tc->heading != NULL)
{
if (y == 0)
{
s = xstrdup (tc->heading);
- cell->contents = s;
+ cell->inline_contents.text = s;
cell->destructor = free_string;
cell->destructor_aux = s;
return;
s = data_out (case_data_idx (c, 0), UTF8, &tc->format);
case_unref (c);
}
- cell->contents = s;
+ cell->inline_contents.text = s;
cell->destructor = free_string;
cell->destructor_aux = s;
}
int x UNUSED, int y)
{
struct table_casereader *tc = table_casereader_cast (t);
- return axis == TABLE_VERT && tc->heading != NULL && y == 1 ? TAL_1 : TAL_0;
+ if (axis == TABLE_VERT)
+ return tc->heading != NULL && y == 1 ? TAL_1 : TAL_0;
+ else
+ return TAL_GAP;
}
static const struct table_class table_casereader_class =