text-item: Merge "title" and "subtitle" items into a new "page title".

[pspp] / src / output / ascii.c

diff --git a/src/output/ascii.c b/src/output/ascii.c
index c2c5dd54fd55863dd6580e7bfabb07ff8442c3b8..46ab98a95c41a7dab77b0ccd1145bd59ec8be794 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,8 +484,7 @@ ascii_submit (struct output_driver *driver,
 
       switch (type)
         {
-        case TEXT_ITEM_TITLE:
-        case TEXT_ITEM_SUBTITLE:
+        case TEXT_ITEM_PAGE_TITLE:
         case TEXT_ITEM_COMMAND_OPEN:
         case TEXT_ITEM_COMMAND_CLOSE:
           break;
@@ -612,7 +611,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])