#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"
enum
{
ASCII_LINE_NONE,
+ ASCII_LINE_DASHED,
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] =
+struct box_chars
{
- ' ', '|', '#',
- '-', '+', '#',
- '=', '#', '#',
- '|', '|', '#',
- '+', '+', '#',
- '#', '#', '#',
- '#', '#', '#',
- '#', '#', '#',
- '#', '#', '#',
- '-', '+', '#',
- '-', '+', '#',
- '#', '#', '#',
- '+', '+', '#',
- '+', '+', '#',
- '#', '#', '#',
- '#', '#', '#',
- '#', '#', '#',
- '#', '#', '#',
- '=', '#', '#',
- '#', '#', '#',
- '=', '#', '#',
- '#', '#', '#',
- '#', '#', '#',
- '#', '#', '#',
- '#', '#', '#',
- '#', '#', '#',
- '#', '#', '#',
+ ucs4_t c[ASCII_N_LINES][ASCII_N_LINES][ASCII_N_LINES][ASCII_N_LINES];
};
-static const ucs4_t unicode_box_chars[N_BOX] =
- {
- 0x0020, 0x2575, 0x2551,
- 0x2574, 0x256f, 0x255c,
- 0x2550, 0x255b, 0x255d,
- 0x2577, 0x2502, 0x2551,
- 0x256e, 0x2524, 0x2562,
- 0x2555, 0x2561, 0x2563,
- 0x2551, 0x2551, 0x2551,
- 0x2556, 0x2562, 0x2562,
- 0x2557, 0x2563, 0x2563,
- 0x2576, 0x2570, 0x2559,
- 0x2500, 0x2534, 0x2568,
- 0x2550, 0x2567, 0x2569,
- 0x256d, 0x251c, 0x255f,
- 0x252c, 0x253c, 0x256a,
- 0x2564, 0x256a, 0x256c,
- 0x2553, 0x255f, 0x255f,
- 0x2565, 0x256b, 0x256b,
- 0x2566, 0x256c, 0x256c,
- 0x2550, 0x2558, 0x255a,
- 0x2550, 0x2567, 0x2569,
- 0x2550, 0x2567, 0x2569,
- 0x2552, 0x255e, 0x2560,
- 0x2564, 0x256a, 0x256c,
- 0x2564, 0x256a, 0x256c,
- 0x2554, 0x2560, 0x2560,
- 0x2560, 0x256c, 0x256c,
- 0x2566, 0x256c, 0x256c,
+static const struct box_chars *
+get_ascii_box (void)
+{
+ enum {
+ _ = ASCII_LINE_NONE,
+ d = ASCII_LINE_DASHED,
+ S = ASCII_LINE_SINGLE,
+ D = ASCII_LINE_DOUBLE,
+ };
+
+ static const struct box_chars ascii_box =
+ {
+ /* r b l t: _ d S D */
+ .c[_][_][_] = { ' ', '|', '|', '#', },
+ .c[_][_][d] = { '-', '+', '+', '#', },
+ .c[_][_][S] = { '-', '+', '+', '#', },
+ .c[_][_][D] = { '=', '#', '#', '#', },
+ .c[_][d][_] = { '|', '|', '|', '#', },
+ .c[_][d][d] = { '+', '+', '+', '#', },
+ .c[_][d][S] = { '+', '+', '+', '#', },
+ .c[_][d][D] = { '#', '#', '#', '#', },
+ .c[_][S][_] = { '|', '|', '|', '#', },
+ .c[_][S][d] = { '+', '+', '+', '#', },
+ .c[_][S][S] = { '+', '+', '+', '#', },
+ .c[_][S][D] = { '#', '#', '#', '#', },
+ .c[_][D][_] = { '#', '#', '#', '#', },
+ .c[_][D][d] = { '#', '#', '#', '#', },
+ .c[_][D][S] = { '#', '#', '#', '#', },
+ .c[_][D][D] = { '#', '#', '#', '#', },
+ .c[d][_][_] = { '-', '+', '+', '#', },
+ .c[d][_][d] = { '-', '+', '+', '#', },
+ .c[d][_][S] = { '-', '+', '+', '#', },
+ .c[d][_][D] = { '#', '#', '#', '#', },
+ .c[d][d][_] = { '+', '+', '+', '#', },
+ .c[d][d][d] = { '+', '+', '+', '#', },
+ .c[d][d][S] = { '+', '+', '+', '#', },
+ .c[d][d][D] = { '#', '#', '#', '#', },
+ .c[d][S][_] = { '+', '+', '+', '#', },
+ .c[d][S][d] = { '+', '+', '+', '#', },
+ .c[d][S][S] = { '+', '+', '+', '#', },
+ .c[d][S][D] = { '#', '#', '#', '#', },
+ .c[d][D][_] = { '#', '#', '#', '#', },
+ .c[d][D][d] = { '#', '#', '#', '#', },
+ .c[d][D][S] = { '#', '#', '#', '#', },
+ .c[d][D][D] = { '#', '#', '#', '#', },
+ .c[S][_][_] = { '-', '+', '+', '#', },
+ .c[S][_][d] = { '-', '+', '+', '#', },
+ .c[S][_][S] = { '-', '+', '+', '#', },
+ .c[S][_][D] = { '#', '#', '#', '#', },
+ .c[S][d][_] = { '+', '+', '+', '#', },
+ .c[S][d][d] = { '+', '+', '+', '#', },
+ .c[S][d][S] = { '+', '+', '+', '#', },
+ .c[S][d][D] = { '#', '#', '#', '#', },
+ .c[S][S][_] = { '+', '+', '+', '#', },
+ .c[S][S][d] = { '+', '+', '+', '#', },
+ .c[S][S][S] = { '+', '+', '+', '#', },
+ .c[S][S][D] = { '#', '#', '#', '#', },
+ .c[S][D][_] = { '#', '#', '#', '#', },
+ .c[S][D][d] = { '#', '#', '#', '#', },
+ .c[S][D][S] = { '#', '#', '#', '#', },
+ .c[S][D][D] = { '#', '#', '#', '#', },
+ .c[D][_][_] = { '=', '#', '#', '#', },
+ .c[D][_][d] = { '#', '#', '#', '#', },
+ .c[D][_][S] = { '#', '#', '#', '#', },
+ .c[D][_][D] = { '=', '#', '#', '#', },
+ .c[D][d][_] = { '#', '#', '#', '#', },
+ .c[D][d][d] = { '#', '#', '#', '#', },
+ .c[D][d][S] = { '#', '#', '#', '#', },
+ .c[D][d][D] = { '#', '#', '#', '#', },
+ .c[D][S][_] = { '#', '#', '#', '#', },
+ .c[D][S][d] = { '#', '#', '#', '#', },
+ .c[D][S][S] = { '#', '#', '#', '#', },
+ .c[D][S][D] = { '#', '#', '#', '#', },
+ .c[D][D][_] = { '#', '#', '#', '#', },
+ .c[D][D][d] = { '#', '#', '#', '#', },
+ .c[D][D][S] = { '#', '#', '#', '#', },
+ .c[D][D][D] = { '#', '#', '#', '#', },
+ };
+ return &ascii_box;
+}
+
+static const struct box_chars *
+get_unicode_box (void)
+{
+ enum {
+ _ = ASCII_LINE_NONE,
+ d = ASCII_LINE_DASHED,
+ S = ASCII_LINE_SINGLE,
+ D = ASCII_LINE_DOUBLE,
};
+ static const struct box_chars unicode_box =
+ {
+ /* r b l t: _ d S D */
+ .c[_][_][_] = { 0x0020, 0x2575, 0x2575, 0x2551, }, /* ╵╵║ */
+ .c[_][_][d] = { 0x2574, 0x256f, 0x256f, 0x255c, }, /* ╴╯╯╜ */
+ .c[_][_][S] = { 0x2574, 0x256f, 0x256f, 0x255c, }, /* ╴╯╯╜ */
+ .c[_][_][D] = { 0x2550, 0x255b, 0x255b, 0x255d, }, /* ═╛╛╝ */
+ .c[_][S][_] = { 0x2577, 0x2502, 0x2502, 0x2551, }, /* ╷││║ */
+ .c[_][S][d] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */
+ .c[_][S][S] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */
+ .c[_][S][D] = { 0x2555, 0x2561, 0x2561, 0x2563, }, /* ╕╡╡╣ */
+ .c[_][d][_] = { 0x2577, 0x250a, 0x2502, 0x2551, }, /* ╷┊│║ */
+ .c[_][d][d] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */
+ .c[_][d][S] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */
+ .c[_][d][D] = { 0x2555, 0x2561, 0x2561, 0x2563, }, /* ╕╡╡╣ */
+ .c[_][D][_] = { 0x2551, 0x2551, 0x2551, 0x2551, }, /* ║║║║ */
+ .c[_][D][d] = { 0x2556, 0x2562, 0x2562, 0x2562, }, /* ╖╢╢╢ */
+ .c[_][D][S] = { 0x2556, 0x2562, 0x2562, 0x2562, }, /* ╖╢╢╢ */
+ .c[_][D][D] = { 0x2557, 0x2563, 0x2563, 0x2563, }, /* ╗╣╣╣ */
+ .c[d][_][_] = { 0x2576, 0x2570, 0x2570, 0x2559, }, /* ╶╰╰╙ */
+ .c[d][_][d] = { 0x254c, 0x2534, 0x2534, 0x2568, }, /* ╌┴┴╨ */
+ .c[d][_][S] = { 0x2500, 0x2534, 0x2534, 0x2568, }, /* ─┴┴╨ */
+ .c[d][_][D] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */
+ .c[d][d][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */
+ .c[d][d][d] = { 0x252c, 0x002b, 0x253c, 0x256a, }, /* ┬+┼╪ */
+ .c[d][d][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+ .c[d][d][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+ .c[d][S][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */
+ .c[d][S][d] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+ .c[d][S][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+ .c[d][S][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+ .c[d][D][_] = { 0x2553, 0x255f, 0x255f, 0x255f, }, /* ╓╟╟╟ */
+ .c[d][D][d] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */
+ .c[d][D][S] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */
+ .c[d][D][D] = { 0x2566, 0x256c, 0x256c, 0x256c, }, /* ╦╬╬╬ */
+ .c[S][_][_] = { 0x2576, 0x2570, 0x2570, 0x2559, }, /* ╶╰╰╙ */
+ .c[S][_][d] = { 0x2500, 0x2534, 0x2534, 0x2568, }, /* ─┴┴╨ */
+ .c[S][_][S] = { 0x2500, 0x2534, 0x2534, 0x2568, }, /* ─┴┴╨ */
+ .c[S][_][D] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */
+ .c[S][d][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */
+ .c[S][d][d] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+ .c[S][d][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+ .c[S][d][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+ .c[S][S][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */
+ .c[S][S][d] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+ .c[S][S][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */
+ .c[S][S][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+ .c[S][D][_] = { 0x2553, 0x255f, 0x255f, 0x255f, }, /* ╓╟╟╟ */
+ .c[S][D][d] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */
+ .c[S][D][S] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */
+ .c[S][D][D] = { 0x2566, 0x256c, 0x256c, 0x256c, }, /* ╦╬╬╬ */
+ .c[D][_][_] = { 0x2550, 0x2558, 0x2558, 0x255a, }, /* ═╘╘╚ */
+ .c[D][_][d] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */
+ .c[D][_][S] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */
+ .c[D][_][D] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */
+ .c[D][d][_] = { 0x2552, 0x255e, 0x255e, 0x2560, }, /* ╒╞╞╠ */
+ .c[D][d][d] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+ .c[D][d][S] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+ .c[D][d][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+ .c[D][S][_] = { 0x2552, 0x255e, 0x255e, 0x2560, }, /* ╒╞╞╠ */
+ .c[D][S][d] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+ .c[D][S][S] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+ .c[D][S][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */
+ .c[D][D][_] = { 0x2554, 0x2560, 0x2560, 0x2560, }, /* ╔╠╠╠ */
+ .c[D][D][d] = { 0x2560, 0x256c, 0x256c, 0x256c, }, /* ╠╬╬╬ */
+ .c[D][D][S] = { 0x2560, 0x256c, 0x256c, 0x256c, }, /* ╠╬╬╬ */
+ .c[D][D][D] = { 0x2566, 0x256c, 0x256c, 0x256c, }, /* ╦╬╬╬ */
+ };
+ return &unicode_box;
+}
+
static int
ascii_line_from_render_line (int render_line)
{
case RENDER_LINE_NONE:
return ASCII_LINE_NONE;
- case RENDER_LINE_SINGLE:
case RENDER_LINE_DASHED:
+ return ASCII_LINE_DASHED;
+
+ case RENDER_LINE_SINGLE:
case RENDER_LINE_THICK:
case RENDER_LINE_THIN:
return ASCII_LINE_SINGLE;
}
-static int
-make_box_index (int left_, int right_, int top_, int bottom_)
+static ucs4_t
+box_get (const struct box_chars *box,
+ int left_, int right_, int top_, int bottom_)
{
bool rtl = render_direction_rtl ();
int left = ascii_line_from_render_line (rtl ? right_ : left_);
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;
+ return box->c[right][bottom][left][top];
}
/* ASCII output driver. */
int min_hbreak; /* Min cell size to break across pages. */
- const ucs4_t *box; /* Line & box drawing characters. */
+ const struct box_chars *box; /* Line & box drawing characters. */
/* Internal state. */
struct file_handle *handle;
"ascii", BOX_ASCII,
"unicode", BOX_UNICODE,
NULL_SENTINEL);
- a->box = box == BOX_ASCII ? ascii_box_chars : unicode_box_chars;
+ a->box = box == BOX_ASCII ? get_ascii_box () : get_unicode_box ();
a->file = NULL;
a->error = false;
table_item_unref (table_item);
}
-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));
-}
-
static void
ascii_submit (struct output_driver *driver,
const struct output_item *output_item)
{
struct text_item *text_item;
- text_item = text_item_create_format (
- TEXT_ITEM_LOG, _("See %s for a chart."), file_name);
+ text_item = text_item_create_nocopy (
+ TEXT_ITEM_LOG,
+ xasprintf (_("See %s for a chart."), file_name),
+ NULL);
ascii_submit (driver, &text_item->output_item);
text_item_unref (text_item);
a, text_item_to_table_item (text_item_ref (text_item)));
}
else if (is_message_item (output_item))
- {
- const struct message_item *message_item = to_message_item (output_item);
- char *s = msg_to_string (message_item_get_msg (message_item));
- ascii_output_text (a, s);
- free (s);
- }
+ ascii_output_table_item_unref (
+ a, text_item_to_table_item (
+ message_item_to_text_item (
+ to_message_item (
+ output_item_ref (output_item)))));
}
const struct output_driver_factory txt_driver_factory =
return;
/* Draw. */
- uc = a->box[make_box_index (styles[V][0], styles[V][1],
- styles[H][0], styles[H][1])];
+ uc = box_get (a->box, styles[V][0], styles[V][1], styles[H][0], styles[H][1]);
mblen = u8_uctomb (CHAR_CAST (uint8_t *, mbchar), uc, 6);
for (y = y0; y < y1; y++)
{
ascii_layout_cell (a, cell, bb, clip, max_width, &h);
if (cell->n_footnotes || strchr (cell->text, ' ')
- || cell->n_subscripts || cell->superscript)
+ || cell->n_subscripts)
{
bb[H][1] = 1;
ascii_layout_cell (a, cell, bb, clip, min_width, &h);
ds_put_cstr (&s, text);
for (size_t i = 0; i < cell->n_subscripts; i++)
ds_put_format (&s, "%c%s", i ? ',' : '_', cell->subscripts[i]);
- if (cell->superscript)
- ds_put_format (&s, "^%s", cell->superscript);
for (size_t i = 0; i < cell->n_footnotes; i++)
ds_put_format (&s, "[%s]", cell->footnotes[i]->marker);
return ds_steal_cstr (&s);
? output_get_text_from_markup (cell->text)
: cell->text);
- /* Append footnotes, subscripts, superscript if any. */
+ /* Append footnotes, subscripts if any. */
const char *text;
- if (cell->n_footnotes || cell->n_subscripts || cell->superscript)
+ if (cell->n_footnotes || cell->n_subscripts)
{
text = add_markers (plain_text, cell);
if (plain_text != cell->text)