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")
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 ();
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)));
}
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,