X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=8ac2b189abf60bb5dd766e322754ce82dd38c22b;hb=a1b7813a6993b8a8822914a83982a52e98c2afe5;hp=d121987a20c5d389eff0f5572a0b1386302bc2b1;hpb=3c70826f9e59d2008305ed8305554a532851f6d9;p=pspp diff --git a/src/output/ascii.c b/src/output/ascii.c index d121987a20..8ac2b189ab 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,12 +22,13 @@ #include #include #include -#include #include +#include #include #include #include "data/file-name.h" +#include "data/file-handle-def.h" #include "data/settings.h" #include "libpspp/assertion.h" #include "libpspp/cast.h" @@ -35,6 +36,7 @@ #include "libpspp/message.h" #include "libpspp/start-date.h" #include "libpspp/string-map.h" +#include "libpspp/u8-line.h" #include "libpspp/version.h" #include "output/ascii.h" #include "output/cairo.h" @@ -47,9 +49,9 @@ #include "output/table-item.h" #include "output/text-item.h" -#include "gl/error.h" #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] = { @@ -119,29 +129,48 @@ static const ucs4_t unicode_box_chars[N_BOX] = 0x2564, 0x256a, 0x256c, 0x2564, 0x256a, 0x256c, 0x2554, 0x2560, 0x2560, + 0x2560, 0x256c, 0x256c, 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 * 3 + bottom) * 3 + left) * 3 + top; -} + switch (render_line) + { + case RENDER_LINE_NONE: + return ASCII_LINE_NONE; -/* A line of text. */ -struct ascii_line - { - struct string s; /* Content, in UTF-8. */ - size_t width; /* Display width, in character positions. */ - }; + case RENDER_LINE_SINGLE: + case RENDER_LINE_DASHED: + case RENDER_LINE_THICK: + case RENDER_LINE_THIN: + return ASCII_LINE_SINGLE; -/* How to emphasize text. */ -enum emphasis_style - { - EMPH_BOLD, /* Overstrike for bold. */ - EMPH_UNDERLINE, /* Overstrike for underlining. */ - EMPH_NONE /* No emphasis. */ - }; + case RENDER_LINE_DOUBLE: + return ASCII_LINE_DOUBLE; + + default: + return ASCII_LINE_NONE; + } + +} + +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 @@ -150,56 +179,51 @@ 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 + /* Colours for charts */ + struct xr_color fg; + struct xr_color bg; +#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 ascii_line *lines; /* Page content. */ + struct u8_line *lines; /* Page content. */ int allocated_lines; /* Number of lines allocated. */ int chart_cnt; /* Number of charts so far. */ - int y; + struct render_params params; }; 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 struct ascii_driver * @@ -217,55 +241,65 @@ 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->emphasis = parse_boolean (opt (d, o, "emphasis", "false")); - a->chart_file_name = parse_chart_file_name (opt (d, o, "charts", file_name)); + a->chart_file_name = parse_chart_file_name (opt (d, o, "charts", fh_get_file_name (fh))); + a->handle = fh; - 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); + min_break[H] = parse_int (opt (d, o, "min-hbreak", "-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; +#ifdef HAVE_CAIRO + parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &a->bg); + parse_color (d, o, "foreground-color", "#000000000000", &a->fg); +#endif box = parse_enum (opt (d, o, "box", "ascii"), "ascii", BOX_ASCII, "unicode", BOX_UNICODE, 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; + 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; + 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; + } + for (int i = 0; i < TABLE_N_AXES; i++) + a->params.min_break[i] = a->min_break[i]; + a->params.supports_margins = false; + a->params.rtl = render_direction_rtl (); + if (!update_page_size (a, true)) goto error; @@ -295,7 +329,7 @@ parse_page_size (struct driver_option *option) if (dim >= 1 && errno != ERANGE && *tail == '\0') dim = value; else - error (0, 0, _("%s: %s must be positive integer or `auto'"), + msg (MW, _("%s: %s must be positive integer or `auto'"), option->driver_name, option->name); } } @@ -305,38 +339,29 @@ 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->params.size[H] = a->width = settings_get_viewwidth (); + a->params.min_break[H] = a->min_break[H] = a->width / 2; + } - if (a->width < MIN_WIDTH || a->length < MIN_LENGTH) + if (a->width < MIN_WIDTH) { if (issue_error) - error (0, 0, - _("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); + msg (ME, + _("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; + a->params.size[H] = a->width = MIN_WIDTH; return false; } @@ -349,18 +374,12 @@ 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++) - ds_destroy (&a->lines[i].s); + u8_line_destroy (&a->lines[i]); free (a->lines); free (a); } @@ -369,116 +388,47 @@ 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) - error (0, 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->contents = caption; - cell->options = TAB_LEFT; - 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_break x_break; - int caption_height; - int i; + struct render_pager *p; 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; - params.draw_cell = ascii_draw_cell, - params.aux = a; - params.size[H] = a->width; - params.size[V] = a->length - caption_height; - 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; - } - - 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 (¶ms, table_item_get_table (table_item)); - for (render_break_init (&x_break, page, H); - render_break_has_next (&x_break); ) + p = render_pager_create (&a->params, table_item); + for (int i = 0; render_pager_has_next (p); i++) { - struct render_page *x_slice; - struct render_break y_break; - - x_slice = render_break_next (&x_break, a->width); - for (render_break_init (&y_break, x_slice, V); - render_break_has_next (&y_break); ) - { - struct render_page *y_slice; - int space; - - if (a->y > 0) - a->y++; - - space = a->length - a->y - caption_height; - if (render_break_next_size (&y_break) > space) - { - assert (a->y > 0); - ascii_close_page (a); - if (!ascii_open_page (a)) - return; - continue; - } - - y_slice = render_break_next (&y_break, space); - 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 (y_slice); - a->y += render_page_get_size (y_slice, V); - render_page_unref (y_slice); - } - render_break_destroy (&y_break); + if (i) + putc ('\n', a->file); + ascii_output_lines (a, render_pager_draw_next (p, INT_MAX)); } - render_break_destroy (&x_break); + render_pager_destroy (p); } static void @@ -486,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); } @@ -497,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; @@ -511,7 +460,9 @@ ascii_submit (struct output_driver *driver, char *file_name; file_name = xr_draw_png_chart (chart_item, a->chart_file_name, - a->chart_cnt++); + a->chart_cnt++, + &a->fg, + &a->bg); if (file_name != NULL) { struct text_item *text_item; @@ -529,53 +480,34 @@ 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); - const char *text = text_item_get_text (text_item); 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: - ascii_output_text (a, text); + ascii_output_table_item (a, text_item_to_table_item (text_item_ref (text_item))); break; } } 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); } } const struct output_driver_factory txt_driver_factory = - { "txt", ascii_create }; + { "txt", "-", ascii_create }; const struct output_driver_factory list_driver_factory = - { "list", ascii_create }; + { "list", "-", ascii_create }; static const struct output_driver_class ascii_driver_class = { @@ -595,27 +527,29 @@ 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]; - int x0, x1, y1; + int x0, y0, x1, y1; ucs4_t uc; int mblen; int x, y; /* Clip to the page. */ - if (bb[H][0] >= a->width || bb[V][0] + a->y >= a->length) - return; - x0 = bb[H][0]; + x0 = MAX (bb[H][0], 0); + y0 = MAX (bb[V][0], 0); x1 = MIN (bb[H][1], a->width); - y1 = MIN (bb[V][1] + a->y, a->length); + y1 = bb[V][1]; + if (x1 <= 0 || y1 <= 0 || x0 >= a->width) + return; /* Draw. */ uc = a->box[make_box_index (styles[V][0], styles[V][1], styles[H][0], styles[H][1])]; mblen = u8_uctomb (CHAR_CAST (uint8_t *, mbchar), uc, 6); - for (y = bb[V][0] + a->y; y < y1; y++) + for (y = y0; y < y1; y++) { char *p = ascii_reserve (a, y, x0, x1, mblen * (x1 - x0)); for (x = x0; x < x1; x++) @@ -642,7 +576,9 @@ ascii_measure_cell_width (void *a_, const struct table_cell *cell, clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0; ascii_layout_cell (a, cell, bb, clip, max_width, &h); - if (strchr (cell->contents, ' ')) + if (cell->n_contents != 1 + || cell->contents[0].n_footnotes + || strchr (cell->contents[0].text, ' ')) { bb[H][1] = 1; ascii_layout_cell (a, cell, bb, clip, min_width, &h); @@ -669,8 +605,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; @@ -678,154 +616,38 @@ ascii_draw_cell (void *a_, const struct table_cell *cell, ascii_layout_cell (a, cell, bb, clip, &w, &h); } -static int -u8_mb_to_display (int *wp, const uint8_t *s, size_t n) -{ - size_t ofs; - ucs4_t uc; - int w; - - ofs = u8_mbtouc (&uc, s, n); - if (ofs < n && s[ofs] == '\b') - { - ofs++; - ofs += u8_mbtouc (&uc, s + ofs, n - ofs); - } - - w = uc_width (uc, "UTF-8"); - if (w <= 0) - { - *wp = 0; - return ofs; - } - - while (ofs < n) - { - int mblen = u8_mbtouc (&uc, s + ofs, n - ofs); - if (uc_width (uc, "UTF-8") > 0) - break; - ofs += mblen; - } - - *wp = w; - return ofs; -} - -struct ascii_pos - { - int x0; - int x1; - size_t ofs0; - size_t ofs1; - }; - -static void -find_ascii_pos (struct ascii_line *line, int target_x, struct ascii_pos *c) -{ - const uint8_t *s = CHAR_CAST (const uint8_t *, ds_cstr (&line->s)); - size_t length = ds_length (&line->s); - size_t ofs; - int mblen; - int x; - - x = 0; - for (ofs = 0; ; ofs += mblen) - { - int w; - - mblen = u8_mb_to_display (&w, s + ofs, length - ofs); - if (x + w > target_x) - { - c->x0 = x; - c->x1 = x + w; - c->ofs0 = ofs; - c->ofs1 = ofs + mblen; - return; - } - x += w; - } -} - static char * ascii_reserve (struct ascii_driver *a, int y, int x0, int x1, int n) { - struct ascii_line *line; - assert (y < a->allocated_lines); - line = &a->lines[y]; - - if (x0 >= line->width) + if (y >= a->allocated_lines) { - /* The common case: adding new characters at the end of a line. */ - ds_put_byte_multiple (&line->s, ' ', x0 - line->width); - line->width = x1; - return ds_put_uninit (&line->s, n); - } - else if (x0 == x1) - return NULL; - else - { - /* An unusual case: overwriting characters in the middle of a line. We - don't keep any kind of mapping from bytes to display positions, so we - have to iterate over the whole line starting from the beginning. */ - struct ascii_pos p0, p1; - char *s; - - /* Find the positions of the first and last character. We must find the - both characters' positions before changing the line, because that - would prevent finding the other character's position. */ - find_ascii_pos (line, x0, &p0); - if (x1 < line->width) - find_ascii_pos (line, x1, &p1); - - /* If a double-width character occupies both x0 - 1 and x0, then replace - its first character width by '?'. */ - s = ds_data (&line->s); - while (p0.x0 < x0) - { - s[p0.ofs0++] = '?'; - p0.x0++; - } - - if (x1 >= line->width) - { - ds_truncate (&line->s, p0.ofs0); - line->width = x1; - return ds_put_uninit (&line->s, n); - } - - /* If a double-width character occupies both x1 - 1 and x1, then we need - to replace its second character width by '?'. */ - if (p1.x0 < x1) - { - do - { - s[--p1.ofs1] = '?'; - p1.x0++; - } - while (p1.x0 < x1); - return ds_splice_uninit (&line->s, p0.ofs0, p1.ofs1 - p0.ofs0, n); - } - - return ds_splice_uninit (&line->s, p0.ofs0, p1.ofs0 - p0.ofs0, n); + 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]); - int y0 = MAX (0, clip[V][0] + a->y); - int x1 = clip[H][1]; - int y1 = MIN (a->length, clip[V][1] + a->y); + 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]; @@ -892,7 +714,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 { @@ -912,7 +734,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. */ @@ -927,35 +754,70 @@ 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); } } } -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], - int *widthp, int *heightp) +static char * +add_footnote_markers (const char *text, const struct cell_contents *contents) +{ + struct string s = DS_EMPTY_INITIALIZER; + ds_put_cstr (&s, text); + for (size_t i = 0; i < contents->n_footnotes; i++) + ds_put_format (&s, "[%s]", contents->footnotes[i]->marker); + return ds_steal_cstr (&s); +} + +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) { - const char *text = cell->contents; - size_t length = strlen (text); char *breaks; int bb_width; size_t pos; - int y; - *widthp = 0; - *heightp = 0; - if (length == 0) - return; + int y = bb[V][0]; + + /* Get the basic textual contents. */ + const char *plain_text = (contents->options & TAB_MARKUP + ? output_get_text_from_markup (contents->text) + : contents->text); + + /* Append footnote markers if any. */ + const char *text; + if (contents->n_footnotes) + { + text = add_footnote_markers (plain_text, contents); + if (plain_text != contents->text) + free (CONST_CAST (char *, plain_text)); + } + else + text = plain_text; + + /* Calculate length; if it's zero, then there's nothing to do. */ + size_t length = strlen (text); + if (!length) + { + if (text != contents->text) + free (CONST_CAST (char *, text)); + return y; + } - text = cell->contents; breaks = xmalloc (length + 1); u8_possible_linebreaks (CHAR_CAST (const uint8_t *, text), length, "UTF-8", breaks); @@ -973,6 +835,7 @@ ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell, size_t last_break_ofs = 0; int last_break_width = 0; int width = 0; + size_t graph_ofs; size_t ofs; for (ofs = 0; ofs < n; ) @@ -1008,56 +871,125 @@ ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell, } ofs += mblen; } - if (b[ofs] != UC_BREAK_MANDATORY) - { - while (ofs > 0 && isspace (line[ofs - 1])) - { - ofs--; - width--; - } - } - if (width > *widthp) - *widthp = width; + + /* Trim any trailing spaces off the end of the text to be drawn. */ + for (graph_ofs = ofs; graph_ofs > 0; graph_ofs--) + if (!isspace (line[graph_ofs - 1])) + break; + width -= ofs - graph_ofs; /* Draw text. */ - text_draw (a, cell->options, bb, clip, y, line, ofs, width); + text_draw (a, contents->options, bold, underline, + bb, clip, y, line, graph_ofs, width); - /* Next line. */ - pos += ofs; - if (ofs < n && isspace (line[ofs])) - pos++; + /* 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). */ + if (b[ofs] == UC_BREAK_MANDATORY) + ofs++; + else + while (ofs < n && isspace (line[ofs]) && b[ofs] != UC_BREAK_MANDATORY) + ofs++; + if (width > *widthp) + *widthp = width; + pos += ofs; } - *heightp = y - bb[V][0]; free (breaks); + if (text != contents->text) + free (CONST_CAST (char *, text)); + + return y; +} + +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], + int *widthp, int *heightp) +{ + int bb[TABLE_N_AXES][2]; + size_t i; + + *widthp = 0; + *heightp = 0; + + memcpy (bb, bb_, sizeof bb); + for (i = 0; i < cell->n_contents && bb[V][0] < bb[V][1]; i++) + { + const struct cell_contents *contents = &cell->contents[i]; + + /* Put a blank line between contents. */ + if (i > 0) + { + bb[V][0]++; + if (bb[V][0] >= bb[V][1]) + break; + } + + 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 table_cell cell; int bb[TABLE_N_AXES][2]; int width, height; if (a->file == NULL && !ascii_open_page (a)) return; - a->y = 0; - memset (&cell, 0, sizeof cell); - cell.contents = s; - cell.options = options | TAB_LEFT; + 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); +} + +void +ascii_test_set_length (struct output_driver *driver, int y, int length) +{ + struct ascii_driver *a = ascii_driver_cast (driver); + + if (a->file == NULL && !ascii_open_page (a)) + return; + + if (y < 0) + return; + u8_line_set_length (&a->lines[y], length); +} - a->y = 1; +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. */ @@ -1075,14 +1007,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))) @@ -1096,120 +1026,16 @@ ascii_open_page (struct ascii_driver *a) sigaction (SIGWINCH, &action, NULL); #endif a->auto_width = true; - a->auto_length = true; } } else { - error (0, errno, _("ascii: opening output file `%s'"), - a->file_name); + msg_error (errno, _("ascii: opening output file `%s'"), + fh_get_file_name (a->handle)); a->error = true; return false; } } - a->page_number++; - - if (a->length > a->allocated_lines) - { - a->lines = xnrealloc (a->lines, a->length, sizeof *a->lines); - for (i = a->allocated_lines; i < a->length; i++) - { - struct ascii_line *line = &a->lines[i]; - ds_init_empty (&line->s); - line->width = 0; - } - a->allocated_lines = a->length; - } - - for (i = 0; i < a->length; i++) - { - struct ascii_line *line = &a->lines[i]; - ds_clear (&line->s); - line->width = 0; - } - 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 ascii_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); -}