#include "libpspp/pool.h"
#include "output/driver.h"
#include "output/output-item-provider.h"
-#include "output/tab.h"
+#include "output/table.h"
#include "output/table-item.h"
#include "output/table-provider.h"
case TEXT_ITEM_LOG:
return _("Log");
- case TEXT_ITEM_EJECT_PAGE:
- return _("Page Break");
-
default:
return _("Text");
}
struct table_item *
text_item_to_table_item (struct text_item *text_item)
{
- struct table *tab = tab_create (1, 1, 0, 0, 0, 0);
+ struct table *tab = table_create (1, 1, 0, 0, 0, 0);
- struct area_style *style = pool_alloc (tab->container, sizeof *style);
- *style = (struct area_style) { AREA_STYLE_INITIALIZER__,
- .cell_style.halign = TABLE_HALIGN_LEFT };
+ struct table_area_style *style = pool_alloc (tab->container, sizeof *style);
+ *style = (struct table_area_style) { TABLE_AREA_STYLE_INITIALIZER__,
+ .cell_style.halign = TABLE_HALIGN_LEFT };
struct font_style *font_style = &style->font_style;
if (text_item->typeface)
font_style->typeface = pool_strdup (tab->container, text_item->typeface);
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));
+ table_text (tab, 0, 0, opts, text_item_get_text (text_item));
struct table_item *table_item = table_item_create (tab, NULL, NULL);
text_item_unref (text_item);
return table_item;