Merge master into output branch.

[pspp] / src / language / dictionary / split-file.c

diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c
index 0024787fdd203e022b9e6b2911e3333c90ab6f76..d2f59ccc813fe8661435bb03bee0cbf1a01caa20 100644 (file)
--- a/src/language/dictionary/split-file.c
+++ b/src/language/dictionary/split-file.c
@@ -77,8 +77,8 @@ output_split_file_values (const struct dataset *ds, const struct ccase *c)
   if (split_cnt == 0)
     return;
 
-  t = tab_create (3, split_cnt + 1, 0);
-  tab_dim (t, tab_natural_dimensions, NULL);
+  t = tab_create (3, split_cnt + 1);
+  tab_dim (t, tab_natural_dimensions, NULL, NULL);
   tab_vline (t, TAL_GAP, 1, 0, split_cnt);
   tab_vline (t, TAL_GAP, 2, 0, split_cnt);
   tab_text (t, 0, 0, TAB_NONE, _("Variable"));
@@ -92,11 +92,12 @@ output_split_file_values (const struct dataset *ds, const struct ccase *c)
       const char *val_lab;
       const struct fmt_spec *print = var_get_print_format (v);
 
-      tab_text (t, 0, i + 1, TAB_LEFT | TAT_PRINTF, "%s", var_get_name (v));
+      tab_text_format (t, 0, i + 1, TAB_LEFT, "%s", var_get_name (v));
 
       s = data_out (case_data (c, v), dict_get_encoding (dict), print);
 
-      tab_text (t, 1, i + 1, TAT_PRINTF, "%.*s", print->w, s);
+      tab_text_format (t, 1, i + 1, 0, "%.*s", print->w, s);
+
       free (s);
       
       val_lab = var_lookup_value_label (v, case_data (c, v));