output: Rename a few struct members for consistency.

[pspp] / src / output / text-item.c

diff --git a/src/output/text-item.c b/src/output/text-item.c
index 1531656276c7dd01116eff4b094fc9933362494e..5b18e54c5d4618c693865fb5e9d624accc8ef852 100644 (file)
--- a/src/output/text-item.c
+++ b/src/output/text-item.c
@@ -23,8 +23,12 @@
 #include <stdlib.h>
 
 #include "libpspp/cast.h"
+#include "libpspp/pool.h"
 #include "output/driver.h"
 #include "output/output-item-provider.h"
+#include "output/tab.h"
+#include "output/table-item.h"
+#include "output/table-provider.h"
 
 #include "gl/xalloc.h"
 #include "gl/xvasprintf.h"
@@ -37,7 +41,7 @@
 struct text_item *
 text_item_create_nocopy (enum text_item_type type, char *text)
 {
-  struct text_item *item = xmalloc (sizeof *item);
+  struct text_item *item = xzalloc (sizeof *item);
   output_item_init (&item->output_item, &text_item_class);
   item->text = text;
   item->type = type;
@@ -89,12 +93,39 @@ text_item_submit (struct text_item *item)
 {
   output_submit (&item->output_item);
 }
+
+struct table_item *
+text_item_to_table_item (struct text_item *text_item)
+{
+  struct tab_table *tab = tab_create (1, 1);
+
+  struct cell_style *style = pool_alloc (tab->container, sizeof *style);
+  *style = (struct cell_style) CELL_STYLE_INITIALIZER;
+  if (text_item->typeface)
+    style->typeface = pool_strdup (tab->container, text_item->typeface);
+  style->size = text_item->size;
+  style->bold = text_item->bold;
+  style->italic = text_item->italic;
+  style->underline = text_item->underline;
+  tab->styles[0] = style;
+
+  int opts = TAB_LEFT;
+  if (text_item->markup)
+    opts |= TAB_MARKUP;
+  if (text_item->type == TEXT_ITEM_SYNTAX || text_item->type == TEXT_ITEM_LOG)
+    opts |= TAB_FIX;
+  tab_text (tab, 0, 0, opts, text_item_get_text (text_item));
+  struct table_item *table_item = table_item_create (&tab->table, NULL, NULL);
+  text_item_unref (text_item);
+  return table_item;
+}
 \f
 static void
 text_item_destroy (struct output_item *output_item)
 {
   struct text_item *item = to_text_item (output_item);
   free (item->text);
+  free (item->typeface);
   free (item);
 }