X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=07b05580162d154f5e26bd562aa58c63f7fce258;hb=2720633be76a46488e05bb9a0d45f24a89375065;hp=3113997e4893d515d73d59778e54b0b18562cde2;hpb=96994a54e60e9c95b8bba54c2281acf7059b1203;p=pspp

diff --git a/src/output/ascii.c b/src/output/ascii.c
index 3113997e48..07b0558016 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -47,7 +47,9 @@
 #include "libpspp/u8-line.h"
 #include "libpspp/version.h"
 #include "output/ascii.h"
-#include "output/cairo.h"
+#ifdef HAVE_CAIRO
+#include "output/cairo-chart.h"
+#endif
 #include "output/chart-item-provider.h"
 #include "output/driver-provider.h"
 #include "output/message-item.h"
@@ -235,7 +237,7 @@ static void ascii_measure_cell_width (void *, const struct table_cell *,
 static int ascii_measure_cell_height (void *, const struct table_cell *,
                                       int width);
 static void ascii_draw_cell (void *, const struct table_cell *, int color_idx,
-                             int bb[TABLE_N_AXES][2],
+                             int bb[TABLE_N_AXES][2], int valign_offset,
                              int spill[TABLE_N_AXES][2],
                              int clip[TABLE_N_AXES][2]);
 
@@ -292,8 +294,8 @@ ascii_create (struct  file_handle *fh, enum settings_output_devices device_type,
   a->min_hbreak = parse_int (opt (d, o, "min-hbreak", "-1"), -1, INT_MAX);
 
 #ifdef HAVE_CAIRO
-  parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &a->bg);
-  parse_color (d, o, "foreground-color", "#000000000000", &a->fg);
+  a->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF"));
+  a->fg = parse_color (opt (d, o, "foreground-color", "#000000000000"));
 #endif
 
   const char *default_box = (terminal && (!strcmp (locale_charset (), "UTF-8")
@@ -312,22 +314,29 @@ ascii_create (struct  file_handle *fh, enum settings_output_devices device_type,
   a->chart_cnt = 0;
   a->object_cnt = 0;
 
-  a->params.draw_line = ascii_draw_line;
-  a->params.measure_cell_width = ascii_measure_cell_width;
-  a->params.measure_cell_height = ascii_measure_cell_height;
-  a->params.adjust_break = NULL;
-  a->params.draw_cell = ascii_draw_cell;
+  static const struct render_ops ascii_render_ops = {
+    .draw_line = ascii_draw_line,
+    .measure_cell_width = ascii_measure_cell_width,
+    .measure_cell_height = ascii_measure_cell_height,
+    .adjust_break = NULL,
+    .draw_cell = ascii_draw_cell,
+  };
+  a->params.ops = &ascii_render_ops;
   a->params.aux = a;
   a->params.size[H] = a->width;
   a->params.size[V] = INT_MAX;
   a->params.font_size[H] = 1;
   a->params.font_size[V] = 1;
-  for (int i = 0; i < RENDER_N_LINES; i++)
-    {
-      int width = i == RENDER_LINE_NONE ? 0 : 1;
-      a->params.line_widths[H][i] = width;
-      a->params.line_widths[V][i] = width;
-    }
+
+  static const int ascii_line_widths[RENDER_N_LINES] = {
+    [RENDER_LINE_NONE] = 0,
+    [RENDER_LINE_SINGLE] = 1,
+    [RENDER_LINE_DASHED] = 1,
+    [RENDER_LINE_THICK] = 1,
+    [RENDER_LINE_THIN] = 1,
+    [RENDER_LINE_DOUBLE] = 1,
+  };
+  a->params.line_widths = ascii_line_widths;
   a->params.supports_margins = false;
   a->params.rtl = render_direction_rtl ();
 
@@ -476,7 +485,7 @@ static void
 ascii_output_text (struct ascii_driver *a, const char *text)
 {
   ascii_output_table_item_unref (
-    a, table_item_create (table_from_string (text), NULL, NULL));
+    a, table_item_create (table_from_string (text), NULL, NULL, NULL));
 }
 
 static void
@@ -518,7 +527,7 @@ ascii_submit (struct output_driver *driver,
       const struct text_item *text_item = to_text_item (output_item);
       enum text_item_type type = text_item_get_type (text_item);
 
-      if (type != TEXT_ITEM_PAGE_TITLE && type != TEXT_ITEM_EJECT_PAGE)
+      if (type != TEXT_ITEM_PAGE_TITLE)
         ascii_output_table_item_unref (
           a, text_item_to_table_item (text_item_ref (text_item)));
     }
@@ -632,13 +641,14 @@ 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 color_idx UNUSED,
-                 int bb[TABLE_N_AXES][2],
+                 int bb[TABLE_N_AXES][2], int valign_offset,
                  int spill[TABLE_N_AXES][2] UNUSED,
                  int clip[TABLE_N_AXES][2])
 {
   struct ascii_driver *a = a_;
   int w, h;
 
+  bb[V][0] += valign_offset;
   ascii_layout_cell (a, cell, bb, clip, &w, &h);
 }
 
@@ -940,7 +950,7 @@ ascii_test_write (struct output_driver *driver,
   if (!a->file)
     return;
 
-  struct area_style style = {
+  struct table_area_style style = {
     .cell_style.halign = TABLE_HALIGN_LEFT,
     .font_style.bold = bold,
     .font_style.underline = underline,