output: New page-setup-item.

[pspp] / src / language / utilities / echo.c

diff --git a/src/language/utilities/echo.c b/src/language/utilities/echo.c
index 19e9f9e54bf36b860b46f8d4681ce61660931b10..3f31e335f68432f758ae8a2b75693cea9b114eee 100644 (file)
--- a/src/language/utilities/echo.c
+++ b/src/language/utilities/echo.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,32 +15,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <language/lexer/lexer.h>
-#include <language/command.h>
-#include <output/table.h>
-#include <output/manager.h>
 
-#include "xalloc.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "output/text-item.h"
+
+#include "gl/xalloc.h"
 
 /* Echos a string to the output stream */
 int
 cmd_echo (struct lexer *lexer, struct dataset *ds UNUSED)
 {
-  struct tab_table *tab;
-
-  if (lex_token (lexer) != T_STRING)
+  if (!lex_force_string (lexer))
     return CMD_FAILURE;
 
-  tab = tab_create(1, 1, 0);
-
-  tab_dim (tab, tab_natural_dimensions, NULL);
-  tab_flags (tab, SOMF_NO_TITLE );
-
-  tab_text(tab, 0, 0, 0, ds_cstr (lex_tokstr (lexer)));
-
-  tab_submit(tab);
+  text_item_submit (text_item_create (TEXT_ITEM_LOG, lex_tokcstr (lexer)));
+  lex_get (lexer);
 
   return CMD_SUCCESS;
 }