output: Introduce group_item in place of TEXT_ITEM_COMMAND_OPEN and CLOSE.

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

diff --git a/src/output/text-item.h b/src/output/text-item.h
index da1b208a5ea8cfd40ec5c27339cd2c8307d814a3..1bfb63689b28cd94f6cce1c14b7c8fa570456e03 100644 (file)
--- a/src/output/text-item.h
+++ b/src/output/text-item.h
@@ -30,17 +30,8 @@
 
 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_TITLE,            /* TITLE command. */
-    TEXT_ITEM_SUBTITLE,         /* SUBTITLE command. */
+    TEXT_ITEM_PAGE_TITLE,       /* TITLE and SUBTITLE commands. */
     TEXT_ITEM_SUBHEAD,          /* Heading within a command's output.*/
 
     /* Syntax. */
@@ -64,6 +55,9 @@ 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 text_item *text_item_create (enum text_item_type, const char *text);