output: Introduce group_item in place of TEXT_ITEM_COMMAND_OPEN and CLOSE.

[pspp] / src / output / ascii.c

diff --git a/src/output/ascii.c b/src/output/ascii.c
index c2c5dd54fd55863dd6580e7bfabb07ff8442c3b8..fd580107e3be30a8df60ed7533fe69c966d25e9b 100644 (file)
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -220,7 +220,7 @@ static void ascii_measure_cell_width (void *, const struct table_cell *,
                                       int *min, int *max);
 static int ascii_measure_cell_height (void *, const struct table_cell *,
                                       int width);
-static void ascii_draw_cell (void *, const struct table_cell *,
+static void ascii_draw_cell (void *, const struct table_cell *, int color_idx,
                              int bb[TABLE_N_AXES][2],
                              int spill[TABLE_N_AXES][2],
                              int clip[TABLE_N_AXES][2]);
@@ -484,12 +484,7 @@ ascii_submit (struct output_driver *driver,
 
       switch (type)
         {
-        case TEXT_ITEM_TITLE:
-        case TEXT_ITEM_SUBTITLE:
-        case TEXT_ITEM_COMMAND_OPEN:
-        case TEXT_ITEM_COMMAND_CLOSE:
-          break;
-
+        case TEXT_ITEM_PAGE_TITLE:
         case TEXT_ITEM_BLANK_LINE:
           break;
 
@@ -504,8 +499,7 @@ ascii_submit (struct output_driver *driver,
   else if (is_message_item (output_item))
     {
       const struct message_item *message_item = to_message_item (output_item);
-      const struct msg *msg = message_item_get_msg (message_item);
-      char *s = msg_to_string (msg, message_item->command_name);
+      char *s = msg_to_string (message_item_get_msg (message_item));
       ascii_output_text (a, s);
       free (s);
     }
@@ -612,7 +606,7 @@ ascii_measure_cell_height (void *a_, const struct table_cell *cell, int width)
 }
 
 static void
-ascii_draw_cell (void *a_, const struct table_cell *cell,
+ascii_draw_cell (void *a_, const struct table_cell *cell, int color_idx UNUSED,
                  int bb[TABLE_N_AXES][2],
                  int spill[TABLE_N_AXES][2] UNUSED,
                  int clip[TABLE_N_AXES][2])