From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 2 Jan 2022 03:27:42 +0000 (-0800)
Subject: CTABLES: Support setting the title, caption, ...
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=1728ce9b5d6c5309547881ffea540e99aaff869d

CTABLES: Support setting the title, caption, ...
---

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index ca02ebbae8..53b99519dc 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -2037,7 +2037,18 @@ ctables_execute (struct dataset *ds, struct ctables *ct)
     {
       struct ctables_table *t = ct->tables[i];
 
-      struct pivot_table *pt = pivot_table_create (N_("Custom Tables"));
+      struct pivot_table *pt = pivot_table_create__ (
+        (t->title
+         ? pivot_value_new_user_text (t->title, SIZE_MAX)
+         : pivot_value_new_text (N_("Custom Tables"))),
+        NULL);
+      if (t->caption)
+        pivot_table_set_caption (
+          pt, pivot_value_new_user_text (t->caption, SIZE_MAX));
+      if (t->corner)
+        pivot_table_set_caption (
+          pt, pivot_value_new_user_text (t->corner, SIZE_MAX));
+
       pivot_table_set_look (pt, ct->look);
       struct pivot_dimension *d[PIVOT_N_AXES];
       for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)