Rewrite PSPP output engine.

[pspp-builds.git] / src / language / stats / reliability.q

diff --git a/src/language/stats/reliability.q b/src/language/stats/reliability.q
index 681669d18999fdac3c5516c9815b9079aae99dfb..478f5c5bc1baa06c967f980e6d2704587fe131bc 100644 (file)
--- a/src/language/stats/reliability.q
+++ b/src/language/stats/reliability.q
@@ -27,8 +27,8 @@
 #include <language/command.h>
 #include <libpspp/misc.h>
 #include <math/moments.h>
-#include <output/manager.h>
-#include <output/table.h>
+#include <output/tab.h>
+#include <output/text-item.h>
 
 #include "xalloc.h"
 #include "xmalloca.h"
@@ -379,18 +379,8 @@ run_reliability (struct casereader *input, struct dataset *ds,
        alpha (s->n_items, s->sum_of_variances, s->variance_of_sums);
     }
 
-
-  {
-    struct tab_table *tab = tab_create(1, 1, 0);
-
-    tab_dim (tab, tab_natural_dimensions, NULL);
-    tab_flags (tab, SOMF_NO_TITLE );
-
-    tab_text_format (tab, 0, 0, 0, "Scale: %s", ds_cstr (&rel->scale_name));
-
-    tab_submit(tab);
-  }
-
+  text_item_submit (text_item_create_format (TEXT_ITEM_PARAGRAPH, "Scale: %s",
+                                             ds_cstr (&rel->scale_name)));
 
   case_processing_summary (n_valid, n_missing, dataset_dict (ds));
 }
@@ -425,11 +415,9 @@ reliability_statistics (const struct reliability *rel)
   int heading_columns = rol[rel->model].heading_cols;
   int heading_rows = rol[rel->model].heading_rows;
 
-  struct tab_table *tbl = tab_create (n_cols, n_rows, 0);
+  struct tab_table *tbl = tab_create (n_cols, n_rows);
   tab_headers (tbl, heading_columns, 0, heading_rows, 0);
 
-  tab_dim (tbl, tab_natural_dimensions, NULL);
-
   tab_title (tbl, _("Reliability Statistics"));
 
   /* Vertical lines for the data only */
@@ -468,11 +456,9 @@ reliability_summary_total (const struct reliability *rel)
   const int heading_rows = 1;
   const int n_rows = rel->sc[0].n_items + heading_rows ;
 
-  struct tab_table *tbl = tab_create (n_cols, n_rows, 0);
+  struct tab_table *tbl = tab_create (n_cols, n_rows);
   tab_headers (tbl, heading_columns, 0, heading_rows, 0);
 
-  tab_dim (tbl, tab_natural_dimensions, NULL);
-
   tab_title (tbl, _("Item-Total Statistics"));
 
   /* Vertical lines for the data only */
@@ -678,11 +664,9 @@ case_processing_summary (casenumber n_valid, casenumber n_missing,
   int heading_columns = 2;
   int heading_rows = 1;
   struct tab_table *tbl;
-  tbl = tab_create (n_cols, n_rows, 0);
+  tbl = tab_create (n_cols, n_rows);
   tab_headers (tbl, heading_columns, 0, heading_rows, 0);
 
-  tab_dim (tbl, tab_natural_dimensions, NULL);
-
   tab_title (tbl, _("Case Processing Summary"));
 
   /* Vertical lines for the data only */