output: Move text_item and group_item usage closer to the SPV model.

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

diff --git a/src/output/text-item.h b/src/output/text-item.h
index 9b8345ef827f12e58dbe202a9fc7793ffa858fc5..9efc26490baa59c46459a9c4f72dc952902e0974 100644 (file)
--- a/src/output/text-item.h
+++ b/src/output/text-item.h
@@ -30,34 +30,25 @@
 
 enum text_item_type
   {
-    /* 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_TITLE,            /* Title. */
+    TEXT_ITEM_SYNTAX,           /* Syntax printback logging. */
+    TEXT_ITEM_LOG,              /* Other logging. */
     TEXT_ITEM_EJECT_PAGE        /* Eject page. */
   };
 
+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, markup;
+    char *typeface;
+    int size;
   };
 
 struct text_item *text_item_create (enum text_item_type, const char *text);