pivot-table: Implement hiding footnotes.

[pspp] / src / output / pivot-output.c

diff --git a/src/output/pivot-output.c b/src/output/pivot-output.c
index cd21e2cb195b74c81208ee90fe9860c7bb74a0ea..0efba3e34b0e0a6922644e18338cf219c3fad5db 100644 (file)
--- a/src/output/pivot-output.c
+++ b/src/output/pivot-output.c
@@ -401,7 +401,7 @@ add_references (const struct pivot_table *pt, const struct table *table,
                 size_t idx = cell.value->footnote_indexes[i];
                 assert (idx < pt->n_footnotes);
 
-                if (!refs[idx])
+                if (!refs[idx] && pt->footnotes[idx]->show)
                   {
                     refs[idx] = true;
                     (*n_refs)++;
@@ -635,7 +635,7 @@ pivot_output (const struct pivot_table *pt,
       for (size_t i = 0; i < nf; i++)
         {
           struct string s = DS_EMPTY_INITIALIZER;
-          pivot_value_format (f[i]->marker, pt, &s);
+          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,