projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "work toward getting rid of struct table in table_item"
[pspp]
/
src
/
output
/
pivot-output.c
diff --git
a/src/output/pivot-output.c
b/src/output/pivot-output.c
index 12e1efafdb9b5db905642cd8c0e3614c8a3fabfb..ae12c4dea391e51358a97de2ca85df32fa040c24 100644
(file)
--- a/
src/output/pivot-output.c
+++ b/
src/output/pivot-output.c
@@
-135,9
+135,6
@@
fill_cell (struct table *t, int x1, int y1, int x2, int y2,
if (value->n_subscripts)
table_add_subscripts (t, x1, y1,
value->subscripts, value->n_subscripts);
if (value->n_subscripts)
table_add_subscripts (t, x1, y1,
value->subscripts, value->n_subscripts);
-
- if (value->superscript)
- table_add_superscript (t, x1, y1, value->superscript);
}
}
}
}
@@
-292,7
+289,7
@@
compose_headings (struct table *t,
if (d->root->show_label_in_corner && a_ofs > 0)
{
int bb[TABLE_N_AXES][2];
if (d->root->show_label_in_corner && a_ofs > 0)
{
int bb[TABLE_N_AXES][2];
- bb[a][0] =
a_ofs - 1
;
+ bb[a][0] =
0
;
bb[a][1] = a_ofs - 1;
bb[b][0] = bottom_row - d->label_depth + 1;
bb[b][1] = bottom_row;
bb[a][1] = a_ofs - 1;
bb[b][0] = bottom_row - d->label_depth + 1;
bb[b][1] = bottom_row;
@@
-460,7
+457,7
@@
pivot_table_submit_layer (const struct pivot_table *pt,
struct table_item *ti = table_item_create (table, NULL, NULL, pt->notes);
struct table_item *ti = table_item_create (table, NULL, NULL, pt->notes);
- if (pt->title
&& pt->show_title
)
+ if (pt->title)
{
struct table_item_text *title = pivot_value_to_table_item_text (
pt->title, &pt->look->areas[PIVOT_AREA_TITLE], footnotes,
{
struct table_item_text *title = pivot_value_to_table_item_text (
pt->title, &pt->look->areas[PIVOT_AREA_TITLE], footnotes,