X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fascii.c;h=fd580107e3be30a8df60ed7533fe69c966d25e9b;hb=a353919df75c25331144602421353a856f4236d6;hp=48cad0f23479866a22f9c9494c77571519d7866f;hpb=00e10850124d68e722d9fba5b8c9467fff6863a3;p=pspp

diff --git a/src/output/ascii.c b/src/output/ascii.c
index 48cad0f234..fd580107e3 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -28,6 +28,7 @@
 #include <uniwidth.h>
 
 #include "data/file-name.h"
+#include "data/file-handle-def.h"
 #include "data/settings.h"
 #include "libpspp/assertion.h"
 #include "libpspp/cast.h"
@@ -50,6 +51,7 @@
 
 #include "gl/minmax.h"
 #include "gl/xalloc.h"
+#include "gl/xsize.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -58,8 +60,16 @@
 #define H TABLE_HORZ
 #define V TABLE_VERT
 
-#define N_BOX (RENDER_N_LINES * RENDER_N_LINES \
-               * RENDER_N_LINES * RENDER_N_LINES)
+enum
+  {
+    ASCII_LINE_NONE,
+    ASCII_LINE_SINGLE,
+    ASCII_LINE_DOUBLE,
+    ASCII_N_LINES
+  };
+
+#define N_BOX (ASCII_N_LINES * ASCII_N_LINES \
+               * ASCII_N_LINES * ASCII_N_LINES)
 
 static const ucs4_t ascii_box_chars[N_BOX] =
   {
@@ -123,19 +133,44 @@ static const ucs4_t unicode_box_chars[N_BOX] =
     0x2566, 0x256c, 0x256c,
   };
 
-static inline int
-make_box_index (int left, int right, int top, int bottom)
+static int
+ascii_line_from_render_line (int render_line)
 {
-  return ((right * RENDER_N_LINES + bottom) * RENDER_N_LINES + left) * RENDER_N_LINES + top;
+  switch (render_line)
+    {
+    case RENDER_LINE_NONE:
+      return ASCII_LINE_NONE;
+
+    case RENDER_LINE_SINGLE:
+    case RENDER_LINE_DASHED:
+    case RENDER_LINE_THICK:
+    case RENDER_LINE_THIN:
+      return ASCII_LINE_SINGLE;
+
+    case RENDER_LINE_DOUBLE:
+      return ASCII_LINE_DOUBLE;
+
+    default:
+      return ASCII_LINE_NONE;
+    }
+
 }
 
-/* How to emphasize text. */
-enum emphasis_style
-  {
-    EMPH_BOLD,                  /* Overstrike for bold. */
-    EMPH_UNDERLINE,             /* Overstrike for underlining. */
-    EMPH_NONE                   /* No emphasis. */
-  };
+static int
+make_box_index (int left_, int right_, int top_, int bottom_)
+{
+  bool rtl = render_direction_rtl ();
+  int left = ascii_line_from_render_line (rtl ? right_ : left_);
+  int right = ascii_line_from_render_line (rtl ? left_ : right_);
+  int top = ascii_line_from_render_line (top_);
+  int bottom = ascii_line_from_render_line (bottom_);
+
+  int idx = right;
+  idx = idx * ASCII_N_LINES + bottom;
+  idx = idx * ASCII_N_LINES + left;
+  idx = idx * ASCII_N_LINES + top;
+  return idx;
+}
 
 /* ASCII output driver. */
 struct ascii_driver
@@ -144,10 +179,7 @@ struct ascii_driver
 
     /* User parameters. */
     bool append;                /* Append if output file already exists? */
-    bool headers;		/* Print headers at top of page? */
-    bool paginate;		/* Insert formfeeds? */
-    bool squeeze_blank_lines;   /* Squeeze multiple blank lines into one? */
-    enum emphasis_style emphasis; /* How to emphasize text. */
+    bool emphasis;              /* Enable bold and underline in output? */
     char *chart_file_name;      /* Name of files used for charts. */
 
 #ifdef HAVE_CAIRO
@@ -157,67 +189,42 @@ struct ascii_driver
 #endif
 
     int width;                  /* Page width. */
-    int length;                 /* Page length minus margins and header. */
     bool auto_width;            /* Use viewwidth as page width? */
-    bool auto_length;           /* Use viewlength as page width? */
-
-    int top_margin;		/* Top margin in lines. */
-    int bottom_margin;		/* Bottom margin in lines. */
 
     int min_break[TABLE_N_AXES]; /* Min cell size to break across pages. */
 
     const ucs4_t *box;          /* Line & box drawing characters. */
 
     /* Internal state. */
-    char *command_name;
-    char *title;
-    char *subtitle;
-    char *file_name;            /* Output file name. */
+    struct file_handle *handle;
     FILE *file;                 /* Output file. */
     bool error;                 /* Output error? */
-    int page_number;		/* Current page number. */
     struct u8_line *lines;      /* Page content. */
     int allocated_lines;        /* Number of lines allocated. */
     int chart_cnt;              /* Number of charts so far. */
-    int x, y;
   };
 
 static const struct output_driver_class ascii_driver_class;
 
 static void ascii_submit (struct output_driver *, const struct output_item *);
 
-static int vertical_margins (const struct ascii_driver *);
-
 static bool update_page_size (struct ascii_driver *, bool issue_error);
 static int parse_page_size (struct driver_option *);
 
-static void ascii_close_page (struct ascii_driver *);
 static bool ascii_open_page (struct ascii_driver *);
 
 static void ascii_draw_line (void *, int bb[TABLE_N_AXES][2],
-                             enum render_line_style styles[TABLE_N_AXES][2]);
+                             enum render_line_style styles[TABLE_N_AXES][2],
+                             struct cell_color colors[TABLE_N_AXES][2]);
 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]);
 
-static void
-reallocate_lines (struct ascii_driver *a)
-{
-  if (a->length > a->allocated_lines)
-    {
-      int i;
-      a->lines = xnrealloc (a->lines, a->length, sizeof *a->lines);
-      for (i = a->allocated_lines; i < a->length; i++)
-        u8_line_init (&a->lines[i]);
-      a->allocated_lines = a->length;
-    }
-}
-
-
 static struct ascii_driver *
 ascii_driver_cast (struct output_driver *driver)
 {
@@ -233,43 +240,28 @@ opt (struct output_driver *d, struct string_map *options, const char *key,
 }
 
 static struct output_driver *
-ascii_create (const char *file_name, enum settings_output_devices device_type,
+ascii_create (struct  file_handle *fh, enum settings_output_devices device_type,
               struct string_map *o)
 {
   enum { BOX_ASCII, BOX_UNICODE } box;
   int min_break[TABLE_N_AXES];
   struct output_driver *d;
   struct ascii_driver *a;
-  int paper_length;
 
   a = xzalloc (sizeof *a);
   d = &a->driver;
-  output_driver_init (&a->driver, &ascii_driver_class, file_name, device_type);
+  output_driver_init (&a->driver, &ascii_driver_class, fh_get_file_name (fh), device_type);
   a->append = parse_boolean (opt (d, o, "append", "false"));
-  a->headers = parse_boolean (opt (d, o, "headers", "false"));
-  a->paginate = parse_boolean (opt (d, o, "paginate", "false"));
-  a->squeeze_blank_lines = parse_boolean (opt (d, o, "squeeze", "true"));
-  a->emphasis = parse_enum (opt (d, o, "emphasis", "none"),
-                            "bold", EMPH_BOLD,
-                            "underline", EMPH_UNDERLINE,
-                            "none", EMPH_NONE,
-                            NULL_SENTINEL);
-
-  a->chart_file_name = parse_chart_file_name (opt (d, o, "charts", file_name));
+  a->emphasis = parse_boolean (opt (d, o, "emphasis", "false"));
 
-  a->top_margin = parse_int (opt (d, o, "top-margin", "0"), 0, INT_MAX);
-  a->bottom_margin = parse_int (opt (d, o, "bottom-margin", "0"), 0, INT_MAX);
+  a->chart_file_name = parse_chart_file_name (opt (d, o, "charts", fh_get_file_name (fh)));
+  a->handle = fh;
 
   min_break[H] = parse_int (opt (d, o, "min-hbreak", "-1"), -1, INT_MAX);
-  min_break[V] = parse_int (opt (d, o, "min-vbreak", "-1"), -1, INT_MAX);
 
   a->width = parse_page_size (opt (d, o, "width", "79"));
-  paper_length = parse_page_size (opt (d, o, "length", "66"));
   a->auto_width = a->width < 0;
-  a->auto_length = paper_length < 0;
-  a->length = paper_length - vertical_margins (a);
   a->min_break[H] = min_break[H] >= 0 ? min_break[H] : a->width / 2;
-  a->min_break[V] = min_break[V] >= 0 ? min_break[V] : a->length / 2;
 #ifdef HAVE_CAIRO
   parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &a->bg);
   parse_color (d, o, "foreground-color", "#000000000000", &a->fg);
@@ -280,13 +272,8 @@ ascii_create (const char *file_name, enum settings_output_devices device_type,
                     NULL_SENTINEL);
   a->box = box == BOX_ASCII ? ascii_box_chars : unicode_box_chars;
 
-  a->command_name = NULL;
-  a->title = xstrdup ("");
-  a->subtitle = xstrdup ("");
-  a->file_name = xstrdup (file_name);
   a->file = NULL;
   a->error = false;
-  a->page_number = 0;
   a->lines = NULL;
   a->allocated_lines = 0;
   a->chart_cnt = 1;
@@ -330,43 +317,32 @@ parse_page_size (struct driver_option *option)
   return dim;
 }
 
-static int
-vertical_margins (const struct ascii_driver *a)
-{
-  return a->top_margin + a->bottom_margin + (a->headers ? 3 : 0);
-}
-
-/* Re-calculates the page width and length based on settings,
-   margins, and, if "auto" is set, the size of the user's
-   terminal window or GUI output window. */
+/* Re-calculates the page width based on settings, margins, and, if "auto" is
+   set, the size of the user's terminal window or GUI output window. */
 static bool
 update_page_size (struct ascii_driver *a, bool issue_error)
 {
   enum { MIN_WIDTH = 6, MIN_LENGTH = 6 };
 
   if (a->auto_width)
-    a->width = settings_get_viewwidth ();
-  if (a->auto_length)
-    a->length = settings_get_viewlength () - vertical_margins (a);
+    {
+      a->width = settings_get_viewwidth ();
+      a->min_break[H] = a->width / 2;
+    }
 
-  if (a->width < MIN_WIDTH || a->length < MIN_LENGTH)
+  if (a->width < MIN_WIDTH)
     {
       if (issue_error)
         msg (ME,
-               _("ascii: page excluding margins and headers "
-                 "must be at least %d characters wide by %d lines long, but "
-                 "as configured is only %d characters by %d lines"),
-               MIN_WIDTH, MIN_LENGTH,
-               a->width, a->length);
+               _("ascii: page must be at least %d characters wide, but "
+                 "as configured is only %d characters"),
+               MIN_WIDTH,
+               a->width);
       if (a->width < MIN_WIDTH)
         a->width = MIN_WIDTH;
-      if (a->length < MIN_LENGTH)
-        a->length = MIN_LENGTH;
       return false;
     }
 
-  reallocate_lines (a);
-
   return true;
 }
 
@@ -376,15 +352,9 @@ ascii_destroy (struct output_driver *driver)
   struct ascii_driver *a = ascii_driver_cast (driver);
   int i;
 
-  if (a->y > 0)
-    ascii_close_page (a);
-
   if (a->file != NULL)
-    fn_close (a->file_name, a->file);
-  free (a->command_name);
-  free (a->title);
-  free (a->subtitle);
-  free (a->file_name);
+    fn_close (a->handle, a->file);
+  fh_unref (a->handle);
   free (a->chart_file_name);
   for (i = 0; i < a->allocated_lines; i++)
     u8_line_destroy (&a->lines[i]);
@@ -396,50 +366,36 @@ static void
 ascii_flush (struct output_driver *driver)
 {
   struct ascii_driver *a = ascii_driver_cast (driver);
-  if (a->y > 0)
-    {
-      ascii_close_page (a);
-
-      if (fn_close (a->file_name, a->file) != 0)
-        msg_error (errno, _("ascii: closing output file `%s'"), a->file_name);
-      a->file = NULL;
-    }
+  if (a->file)
+    fflush (a->file);
 }
 
 static void
-ascii_init_caption_cell (const char *caption, struct table_cell *cell)
+ascii_output_lines (struct ascii_driver *a, size_t n_lines)
 {
-  cell->inline_contents.options = TAB_LEFT;
-  cell->inline_contents.text = CONST_CAST (char *, caption);
-  cell->inline_contents.table = NULL;
-  cell->contents = &cell->inline_contents;
-  cell->n_contents = 1;
-  cell->destructor = NULL;
+  for (size_t y = 0; y < n_lines; y++)
+    {
+      struct u8_line *line = &a->lines[y];
+
+      while (ds_chomp_byte (&line->s, ' '))
+        continue;
+      fwrite (ds_data (&line->s), 1, ds_length (&line->s), a->file);
+      putc ('\n', a->file);
+
+      u8_line_clear (&a->lines[y]);
+    }
 }
 
 static void
 ascii_output_table_item (struct ascii_driver *a,
                          const struct table_item *table_item)
 {
-  const char *caption = table_item_get_caption (table_item);
   struct render_params params;
-  struct render_page *page;
   struct render_pager *p;
-  int caption_height;
   int i;
 
   update_page_size (a, false);
 
-  if (caption != NULL)
-    {
-      /* XXX doesn't do well with very large captions */
-      struct table_cell cell;
-      ascii_init_caption_cell (caption, &cell);
-      caption_height = ascii_measure_cell_height (a, &cell, a->width);
-    }
-  else
-    caption_height = 0;
-
   params.draw_line = ascii_draw_line;
   params.measure_cell_width = ascii_measure_cell_width;
   params.measure_cell_height = ascii_measure_cell_height;
@@ -447,7 +403,7 @@ ascii_output_table_item (struct ascii_driver *a,
   params.draw_cell = ascii_draw_cell;
   params.aux = a;
   params.size[H] = a->width;
-  params.size[V] = a->length - caption_height;
+  params.size[V] = INT_MAX;
   params.font_size[H] = 1;
   params.font_size[V] = 1;
   for (i = 0; i < RENDER_N_LINES; i++)
@@ -458,48 +414,19 @@ ascii_output_table_item (struct ascii_driver *a,
     }
   for (i = 0; i < TABLE_N_AXES; i++)
     params.min_break[i] = a->min_break[i];
+  params.supports_margins = false;
 
-  if (a->file == NULL && !ascii_open_page (a))
+  if (a->file)
+    putc ('\n', a->file);
+  else if (!ascii_open_page (a))
     return;
 
-  page = render_page_create (&params, table_item_get_table (table_item));
-  p = render_pager_create (page);
-  while (render_pager_has_next (p))
+  p = render_pager_create (&params, table_item);
+  for (int i = 0; render_pager_has_next (p); i++)
     {
-      int space = a->length - (a->y + (a->y > 0) + caption_height);
-      struct render_page *slice = render_pager_next (p, space);
-      if (!slice)
-        {
-          assert (a->y > 0);
-          ascii_close_page (a);
-          if (!ascii_open_page (a))
-            {
-              render_pager_destroy (p);
-              return;
-            }
-          continue;
-        }
-
-      if (a->y > 0)
-        a->y++;
-
-      if (caption_height)
-        {
-          struct table_cell cell;
-          int bb[TABLE_N_AXES][2];
-
-          ascii_init_caption_cell (caption, &cell);
-          bb[H][0] = 0;
-          bb[H][1] = a->width;
-          bb[V][0] = 0;
-          bb[V][1] = caption_height;
-          ascii_draw_cell (a, &cell, bb, bb);
-          a->y += caption_height;
-          caption_height = 0;
-        }
-      render_page_draw (slice);
-      a->y += render_page_get_size (slice, V);
-      render_page_unref (slice);
+      if (i)
+        putc ('\n', a->file);
+      ascii_output_lines (a, render_pager_draw_next (p, INT_MAX));
     }
   render_pager_destroy (p);
 }
@@ -509,7 +436,8 @@ ascii_output_text (struct ascii_driver *a, const char *text)
 {
   struct table_item *table_item;
 
-  table_item = table_item_create (table_from_string (TAB_LEFT, text), NULL);
+  table_item = table_item_create (table_from_string (TAB_LEFT, text),
+                                  NULL, NULL);
   ascii_output_table_item (a, table_item);
   table_item_unref (table_item);
 }
@@ -520,8 +448,6 @@ ascii_submit (struct output_driver *driver,
 {
   struct ascii_driver *a = ascii_driver_cast (driver);
 
-  output_driver_track_current_command (output_item, &a->command_name);
-
   if (a->error)
     return;
 
@@ -535,7 +461,7 @@ ascii_submit (struct output_driver *driver,
 
       file_name = xr_draw_png_chart (chart_item, a->chart_file_name,
                                      a->chart_cnt++,
-				     &a->fg, 
+				     &a->fg,
 				     &a->bg);
       if (file_name != NULL)
         {
@@ -558,28 +484,11 @@ ascii_submit (struct output_driver *driver,
 
       switch (type)
         {
-        case TEXT_ITEM_TITLE:
-          free (a->title);
-          a->title = xstrdup (text);
-          break;
-
-        case TEXT_ITEM_SUBTITLE:
-          free (a->subtitle);
-          a->subtitle = xstrdup (text);
-          break;
-
-        case TEXT_ITEM_COMMAND_OPEN:
-        case TEXT_ITEM_COMMAND_CLOSE:
-          break;
-
+        case TEXT_ITEM_PAGE_TITLE:
         case TEXT_ITEM_BLANK_LINE:
-          if (a->y > 0)
-            a->y++;
           break;
 
         case TEXT_ITEM_EJECT_PAGE:
-          if (a->y > 0)
-            ascii_close_page (a);
           break;
 
         default:
@@ -590,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, a->command_name);
+      char *s = msg_to_string (message_item_get_msg (message_item));
       ascii_output_text (a, s);
       free (s);
     }
@@ -620,7 +528,8 @@ static void ascii_layout_cell (struct ascii_driver *,
 
 static void
 ascii_draw_line (void *a_, int bb[TABLE_N_AXES][2],
-                 enum render_line_style styles[TABLE_N_AXES][2])
+                 enum render_line_style styles[TABLE_N_AXES][2],
+                 struct cell_color colors[TABLE_N_AXES][2] UNUSED)
 {
   struct ascii_driver *a = a_;
   char mbchar[6];
@@ -630,11 +539,11 @@ ascii_draw_line (void *a_, int bb[TABLE_N_AXES][2],
   int x, y;
 
   /* Clip to the page. */
-  x0 = MAX (bb[H][0] + a->x, 0);
-  y0 = MAX (bb[V][0] + a->y, 0);
-  x1 = MIN (bb[H][1] + a->x, a->width);
-  y1 = MIN (bb[V][1] + a->y, a->length);
-  if (x1 <= 0 || y1 <= 0 || x0 >= a->width || y0 >= a->length)
+  x0 = MAX (bb[H][0], 0);
+  y0 = MAX (bb[V][0], 0);
+  x1 = MIN (bb[H][1], a->width);
+  y1 = bb[V][1];
+  if (x1 <= 0 || y1 <= 0 || x0 >= a->width)
     return;
 
   /* Draw. */
@@ -669,7 +578,7 @@ ascii_measure_cell_width (void *a_, const struct table_cell *cell,
   ascii_layout_cell (a, cell, bb, clip, max_width, &h);
 
   if (cell->n_contents != 1
-      || cell->contents[0].table
+      || cell->contents[0].n_footnotes
       || strchr (cell->contents[0].text, ' '))
     {
       bb[H][1] = 1;
@@ -697,8 +606,10 @@ 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,
-                 int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2])
+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])
 {
   struct ascii_driver *a = a_;
   int w, h;
@@ -709,26 +620,35 @@ ascii_draw_cell (void *a_, const struct table_cell *cell,
 static char *
 ascii_reserve (struct ascii_driver *a, int y, int x0, int x1, int n)
 {
-  assert (y < a->allocated_lines);
+  if (y >= a->allocated_lines)
+    {
+      size_t new_alloc = MAX (25, a->allocated_lines);
+      while (new_alloc <= y)
+        new_alloc = xtimes (new_alloc, 2);
+      a->lines = xnrealloc (a->lines, new_alloc, sizeof *a->lines);
+      for (size_t i = a->allocated_lines; i < new_alloc; i++)
+        u8_line_init (&a->lines[i]);
+      a->allocated_lines = new_alloc;
+    }
   return u8_line_reserve (&a->lines[y], x0, x1, n);
 }
 
 static void
 text_draw (struct ascii_driver *a, unsigned int options,
+           bool bold, bool underline,
            int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2],
            int y, const uint8_t *string, int n, size_t width)
 {
-  int x0 = MAX (0, clip[H][0] + a->x);
-  int y0 = MAX (0, clip[V][0] + a->y);
-  int x1 = MIN (a->width, clip[H][1] + a->x);
-  int y1 = MIN (a->length, clip[V][1] + a->y);
+  int x0 = MAX (0, clip[H][0]);
+  int y0 = MAX (0, clip[V][0]);
+  int x1 = MIN (a->width, clip[H][1]);
+  int y1 = clip[V][1];
   int x;
 
-  y += a->y;
   if (y < y0 || y >= y1)
     return;
 
-  switch (options & TAB_ALIGNMENT)
+  switch (options & TAB_HALIGN)
     {
     case TAB_LEFT:
       x = bb[H][0];
@@ -742,7 +662,6 @@ text_draw (struct ascii_driver *a, unsigned int options,
     default:
       NOT_REACHED ();
     }
-  x += a->x;
   if (x >= x1)
     return;
 
@@ -796,7 +715,7 @@ text_draw (struct ascii_driver *a, unsigned int options,
         return;
     }
 
-  if (!(options & TAB_EMPH) || a->emphasis == EMPH_NONE)
+  if (!a->emphasis || (!bold && !underline))
     memcpy (ascii_reserve (a, y, x, x + width, n), string, n);
   else
     {
@@ -816,7 +735,12 @@ text_draw (struct ascii_driver *a, unsigned int options,
           w = uc_width (uc, "UTF-8");
 
           if (w > 0)
-            n_out += a->emphasis == EMPH_UNDERLINE ? 2 : 1 + mblen;
+            {
+              if (bold)
+                n_out += 1 + mblen;
+              if (underline)
+                n_out += 2;
+            }
         }
 
       /* Then insert them. */
@@ -831,11 +755,16 @@ text_draw (struct ascii_driver *a, unsigned int options,
 
           if (w > 0)
             {
-              if (a->emphasis == EMPH_UNDERLINE)
-                *out++ = '_';
-              else
-                out = mempcpy (out, string + ofs, mblen);
-              *out++ = '\b';
+              if (bold)
+                {
+                  out = mempcpy (out, string + ofs, mblen);
+                  *out++ = '\b';
+                }
+              if (underline)
+                {
+                  *out++ = '_';
+                  *out++ = '\b';
+                }
             }
           out = mempcpy (out, string + ofs, mblen);
         }
@@ -845,21 +774,42 @@ text_draw (struct ascii_driver *a, unsigned int options,
 static int
 ascii_layout_cell_text (struct ascii_driver *a,
                         const struct cell_contents *contents,
+                        bool bold, bool underline,
                         int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2],
                         int *widthp)
 {
-  size_t length = strlen (contents->text);
+  size_t length;
+  const char *text;
   char *breaks;
   int bb_width;
   size_t pos;
   int y;
 
   y = bb[V][0];
-  if (length == 0)
-    return y;
+  length = strlen (contents->text);
+  if (contents->n_footnotes)
+    {
+      struct string s;
+      int i;
+
+      ds_init_empty (&s);
+      ds_extend (&s, length + contents->n_footnotes * 4);
+      ds_put_cstr (&s, contents->text);
+      for (i = 0; i < contents->n_footnotes; i++)
+        ds_put_format (&s, "[%s]", contents->footnotes[i]->marker);
+
+      length = ds_length (&s);
+      text = ds_steal_cstr (&s);
+    }
+  else
+    {
+      if (length == 0)
+        return y;
+      text = contents->text;
+    }
 
   breaks = xmalloc (length + 1);
-  u8_possible_linebreaks (CHAR_CAST (const uint8_t *, contents->text), length,
+  u8_possible_linebreaks (CHAR_CAST (const uint8_t *, text), length,
                           "UTF-8", breaks);
   breaks[length] = (breaks[length - 1] == UC_BREAK_MANDATORY
                     ? UC_BREAK_PROHIBITED : UC_BREAK_POSSIBLE);
@@ -868,7 +818,7 @@ ascii_layout_cell_text (struct ascii_driver *a,
   bb_width = bb[H][1] - bb[H][0];
   for (y = bb[V][0]; y < bb[V][1] && pos < length; y++)
     {
-      const uint8_t *line = CHAR_CAST (const uint8_t *, contents->text + pos);
+      const uint8_t *line = CHAR_CAST (const uint8_t *, text + pos);
       const char *b = breaks + pos;
       size_t n = length - pos;
 
@@ -919,7 +869,8 @@ ascii_layout_cell_text (struct ascii_driver *a,
       width -= ofs - graph_ofs;
 
       /* Draw text. */
-      text_draw (a, contents->options, bb, clip, y, line, graph_ofs, width);
+      text_draw (a, contents->options, bold, underline,
+                 bb, clip, y, line, graph_ofs, width);
 
       /* If a new-line ended the line, just skip the new-line.  Otherwise, skip
          past any spaces past the end of the line (but not past a new-line). */
@@ -935,73 +886,12 @@ ascii_layout_cell_text (struct ascii_driver *a,
     }
 
   free (breaks);
+  if (text != contents->text)
+    free (CONST_CAST (char *, text));
 
   return y;
 }
 
-static int
-ascii_layout_subtable (struct ascii_driver *a,
-                       const struct cell_contents *contents,
-                       int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2] UNUSED,
-                       int *widthp)
-{
-  const struct table *table = contents->table;
-  struct render_params params;
-  struct render_page *page;
-  int r[TABLE_N_AXES][2];
-  int width, height;
-  int i;
-
-  params.draw_line = ascii_draw_line;
-  params.measure_cell_width = ascii_measure_cell_width;
-  params.measure_cell_height = ascii_measure_cell_height;
-  params.adjust_break = NULL;
-  params.draw_cell = ascii_draw_cell,
-  params.aux = a;
-  params.size[H] = bb[TABLE_HORZ][1] - bb[TABLE_HORZ][0];
-  params.size[V] = bb[TABLE_VERT][1] - bb[TABLE_VERT][0];
-  params.font_size[H] = 1;
-  params.font_size[V] = 1;
-  for (i = 0; i < RENDER_N_LINES; i++)
-    {
-      int width = i == RENDER_LINE_NONE ? 0 : 1;
-      params.line_widths[H][i] = width;
-      params.line_widths[V][i] = width;
-    }
-
-  page = render_page_create (&params, table);
-  width = render_page_get_size (page, TABLE_HORZ);
-  height = render_page_get_size (page, TABLE_VERT);
-
-  /* r = intersect(bb, clip) - bb. */
-  for (i = 0; i < TABLE_N_AXES; i++)
-    {
-      r[i][0] = MAX (bb[i][0], clip[i][0]) - bb[i][0];
-      r[i][1] = MIN (bb[i][1], clip[i][1]) - bb[i][0];
-    }
-
-  if (r[H][0] < r[H][1] && r[V][0] < r[V][1])
-    {
-      unsigned int alignment = contents->options & TAB_ALIGNMENT;
-      int save_x = a->x;
-
-      a->x += bb[TABLE_HORZ][0];
-      if (alignment == TAB_RIGHT)
-        a->x += params.size[H] - width;
-      else if (alignment == TAB_CENTER)
-        a->x += (params.size[H] - width) / 2;
-      a->y += bb[TABLE_VERT][0];
-      render_page_draw (page);
-      a->y -= bb[TABLE_VERT][0];
-      a->x = save_x;
-    }
-  render_page_unref (page);
-
-  if (width > *widthp)
-    *widthp = width;
-  return bb[V][0] + height;
-}
-
 static void
 ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell,
                    int bb_[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2],
@@ -1026,44 +916,44 @@ ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell,
             break;
         }
 
-      if (contents->text)
-        bb[V][0] = ascii_layout_cell_text (a, contents, bb, clip, widthp);
-      else
-        bb[V][0] = ascii_layout_subtable (a, contents, bb, clip, widthp);
+      bb[V][0] = ascii_layout_cell_text (a, contents, cell->style->bold,
+                                         cell->style->underline,
+                                         bb, clip, widthp);
     }
   *heightp = bb[V][0] - bb_[V][0];
 }
 
 void
 ascii_test_write (struct output_driver *driver,
-                  const char *s, int x, int y, unsigned int options)
+                  const char *s, int x, int y, bool bold, bool underline)
 {
   struct ascii_driver *a = ascii_driver_cast (driver);
-  struct cell_contents contents;
-  struct table_cell cell;
   int bb[TABLE_N_AXES][2];
   int width, height;
 
   if (a->file == NULL && !ascii_open_page (a))
     return;
-  a->y = 0;
-
-  contents.options = options | TAB_LEFT;
-  contents.text = CONST_CAST (char *, s);
-  contents.table = NULL;
 
-  memset (&cell, 0, sizeof cell);
-  cell.contents = &contents;
-  cell.n_contents = 1;
+  struct cell_contents contents = {
+    .options = TAB_LEFT,
+    .text = CONST_CAST (char *, s),
+  };
+  struct cell_style cell_style = {
+    .bold = bold,
+    .underline = underline,
+  };
+  struct table_cell cell = {
+    .contents = &contents,
+    .n_contents = 1,
+    .style = &cell_style,
+  };
 
   bb[TABLE_HORZ][0] = x;
   bb[TABLE_HORZ][1] = a->width;
   bb[TABLE_VERT][0] = y;
-  bb[TABLE_VERT][1] = a->length;
+  bb[TABLE_VERT][1] = INT_MAX;
 
   ascii_layout_cell (a, &cell, bb, bb, &width, &height);
-
-  a->y = 1;
 }
 
 void
@@ -1074,10 +964,23 @@ ascii_test_set_length (struct output_driver *driver, int y, int length)
   if (a->file == NULL && !ascii_open_page (a))
     return;
 
-  if (y < 0 || y >= a->length)
+  if (y < 0)
     return;
   u8_line_set_length (&a->lines[y], length);
 }
+
+void
+ascii_test_flush (struct output_driver *driver)
+{
+  struct ascii_driver *a = ascii_driver_cast (driver);
+
+  for (size_t i = a->allocated_lines; i-- > 0; )
+    if (a->lines[i].width)
+      {
+        ascii_output_lines (a, i + 1);
+        break;
+      }
+}
 
 /* ascii_close_page () and support routines. */
 
@@ -1094,14 +997,12 @@ winch_handler (int signum UNUSED)
 static bool
 ascii_open_page (struct ascii_driver *a)
 {
-  int i;
-
   if (a->error)
     return false;
 
   if (a->file == NULL)
     {
-      a->file = fn_open (a->file_name, a->append ? "a" : "w");
+      a->file = fn_open (a->handle, a->append ? "a" : "w");
       if (a->file != NULL)
         {
 	  if ( isatty (fileno (a->file)))
@@ -1115,106 +1016,16 @@ ascii_open_page (struct ascii_driver *a)
 	      sigaction (SIGWINCH, &action, NULL);
 #endif
 	      a->auto_width = true;
-	      a->auto_length = true;
 	    }
         }
       else
         {
           msg_error (errno, _("ascii: opening output file `%s'"),
-                 a->file_name);
+		     fh_get_file_name (a->handle));
           a->error = true;
           return false;
         }
     }
 
-  a->page_number++;
-
-  reallocate_lines (a);
-
-  for (i = 0; i < a->length; i++)
-    u8_line_clear (&a->lines[i]);
-
   return true;
 }
-
-static void
-output_title_line (FILE *out, int width, const char *left, const char *right)
-{
-  struct string s = DS_EMPTY_INITIALIZER;
-  ds_put_byte_multiple (&s, ' ', width);
-  if (left != NULL)
-    {
-      size_t length = MIN (strlen (left), width);
-      memcpy (ds_end (&s) - width, left, length);
-    }
-  if (right != NULL)
-    {
-      size_t length = MIN (strlen (right), width);
-      memcpy (ds_end (&s) - length, right, length);
-    }
-  ds_put_byte (&s, '\n');
-  fputs (ds_cstr (&s), out);
-  ds_destroy (&s);
-}
-
-static void
-ascii_close_page (struct ascii_driver *a)
-{
-  bool any_blank;
-  int i, y;
-
-  a->y = 0;
-  if (a->file == NULL)
-    return;
-
-  if (!a->top_margin && !a->bottom_margin && a->squeeze_blank_lines
-      && !a->paginate && a->page_number > 1)
-    putc ('\n', a->file);
-
-  for (i = 0; i < a->top_margin; i++)
-    putc ('\n', a->file);
-  if (a->headers)
-    {
-      char *r1, *r2;
-
-      r1 = xasprintf (_("%s - Page %d"), get_start_date (), a->page_number);
-      r2 = xasprintf ("%s - %s" , version, host_system);
-
-      output_title_line (a->file, a->width, a->title, r1);
-      output_title_line (a->file, a->width, a->subtitle, r2);
-      putc ('\n', a->file);
-
-      free (r1);
-      free (r2);
-    }
-
-  any_blank = false;
-  for (y = 0; y < a->allocated_lines; y++)
-    {
-      struct u8_line *line = &a->lines[y];
-
-      if (a->squeeze_blank_lines && y > 0 && line->width == 0)
-        any_blank = true;
-      else
-        {
-          if (any_blank)
-            {
-              putc ('\n', a->file);
-              any_blank = false;
-            }
-
-          while (ds_chomp_byte (&line->s, ' '))
-            continue;
-          fwrite (ds_data (&line->s), 1, ds_length (&line->s), a->file);
-          putc ('\n', a->file);
-        }
-    }
-  if (!a->squeeze_blank_lines)
-    for (y = a->allocated_lines; y < a->length; y++)
-      putc ('\n', a->file);
-
-  for (i = 0; i < a->bottom_margin; i++)
-    putc ('\n', a->file);
-  if (a->paginate)
-    putc ('\f', a->file);
-}