/* PSPP - a program for statistical analysis.
- Copyright (C) 2009, 2010, 2011 Free Sonftware Foundation, Inc.
+ Copyright (C) 2009, 2010, 2011 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
#include <stdbool.h>
#include "libpspp/compiler.h"
#include "output/output-item.h"
+#include "output/table.h"
enum text_item_type
{
- /* Each PSPP command is bracketed between a pair of these text items. The
- text item's string is the full name of the command. The syntax text
- items associated with the command, as well as all output produced
- directly by the command, are contained within the pair. There is no
- nesting. */
- TEXT_ITEM_COMMAND_OPEN, /* Command starting. */
- TEXT_ITEM_COMMAND_CLOSE, /* Command completed. */
-
- /* Headings. */
TEXT_ITEM_PAGE_TITLE, /* TITLE and SUBTITLE commands. */
- TEXT_ITEM_SUBHEAD, /* Heading within a command's output.*/
-
- /* Syntax. */
- TEXT_ITEM_SYNTAX, /* A single line of PSPP syntax. */
- TEXT_ITEM_COMMENT, /* COMMENT command. */
- TEXT_ITEM_ECHO, /* ECHO command. */
-
- /* Ordinary text. */
- TEXT_ITEM_PARAGRAPH, /* Normal paragraph of text. */
- TEXT_ITEM_MONOSPACE, /* Paragraph of monospaced text. */
-
- /* Spacing. Some output drivers that are not based on lines and pages
- (e.g. CSV, HTML) may ignore these. */
- TEXT_ITEM_BLANK_LINE, /* Blank line. */
- TEXT_ITEM_EJECT_PAGE /* Eject page. */
+ TEXT_ITEM_TITLE, /* Title. */
+ TEXT_ITEM_SYNTAX, /* Syntax printback logging. */
+ TEXT_ITEM_LOG, /* Other logging. */
};
+const char *text_item_type_to_string (enum text_item_type);
+
/* A text item. */
struct text_item
{
struct output_item output_item;
char *text; /* The content. */
enum text_item_type type; /* Type. */
- char *font;
- int font_size;
- bool bold, italic, underline;
+ struct font_style style;
};
-struct text_item *text_item_create (enum text_item_type, const char *text);
-struct text_item *text_item_create_nocopy (enum text_item_type, char *text);
-struct text_item *text_item_create_format (enum text_item_type,
- const char *format, ...)
- PRINTF_FORMAT (2, 3);
+struct text_item *text_item_create (enum text_item_type,
+ const char *text, const char *label);
+struct text_item *text_item_create_nocopy (enum text_item_type,
+ char *text, char *label);
enum text_item_type text_item_get_type (const struct text_item *);
const char *text_item_get_text (const struct text_item *);
+
+struct text_item *text_item_unshare (struct text_item *);
+bool text_item_append (struct text_item *dst, const struct text_item *src);
+
+struct table_item *text_item_to_table_item (struct text_item *);
\f
/* This boilerplate for text_item, a subclass of output_item, was
autogenerated by mk-class-boilerplate. */