static int transpose;
/* --emphasis: ASCII driver emphasis option. */
-static char *emphasis;
+static bool bold;
+static bool underline;
/* --box: ASCII driver box option. */
static char *box;
/* --pdf: Also render PDF output. */
static int render_pdf;
+/* --csv: Also render CSV output. */
+static int render_csv;
+
/* ASCII driver, for ASCII driver test mode. */
static struct output_driver *ascii_driver;
static const char *parse_options (int argc, char **argv);
static void usage (void) NO_RETURN;
-static struct table *read_table (FILE *, struct table **tables, size_t n_tables);
+static struct table *read_table (FILE *);
static void draw (FILE *);
int
FILE *input;
set_program_name (argv[0]);
+ output_engine_push ();
input_file_name = parse_options (argc, argv);
if (!strcmp (input_file_name, "-"))
if (n_tables >= allocated_tables)
tables = x2nrealloc (tables, &allocated_tables, sizeof *tables);
- tables[n_tables] = read_table (input, tables, n_tables);
+ tables[n_tables] = read_table (input);
n_tables++;
ch = getc (input);
table = tables[n_tables - 1];
if (transpose)
table = table_transpose (table);
- table_item_submit (table_item_create (table, NULL));
+ table_item_submit (table_item_create (table, NULL, NULL));
+ free (tables);
}
else
draw (input);
if (input != stdin)
fclose (input);
- output_close ();
+ output_engine_pop ();
return 0;
}
string_map_insert (&options, "output-file", "-");
string_map_insert_nocopy (&options, xstrdup ("width"),
xasprintf ("%d", width));
- string_map_insert_nocopy (&options, xstrdup ("length"),
- xasprintf ("%d", length));
if (min_break >= 0)
- {
- string_map_insert_nocopy (&options, xstrdup ("min-hbreak"),
- xasprintf ("%d", min_break));
- string_map_insert_nocopy (&options, xstrdup ("min-vbreak"),
- xasprintf ("%d", min_break));
- }
- if (emphasis != NULL)
- string_map_insert (&options, "emphasis", emphasis);
+ string_map_insert_nocopy (&options, xstrdup ("min-hbreak"),
+ xasprintf ("%d", min_break));
+ if (bold || underline)
+ string_map_insert (&options, "emphasis", "true");
if (box != NULL)
string_map_insert (&options, "box", box);
}
#endif
+ /* Render to <base>.csv. */
+ if (render_csv)
+ {
+ string_map_clear (&options);
+ string_map_insert_nocopy (&options, xstrdup ("output-file"),
+ xasprintf ("%s.csv", output_base));
+ driver = output_driver_create (&options);
+ if (driver == NULL)
+ exit (EXIT_FAILURE);
+ output_driver_register (driver);
+ }
+
/* Render to <base>.odt. */
string_map_replace_nocopy (&options, xstrdup ("output-file"),
xasprintf ("%s.odt", output_base));
{"no-txt", no_argument, &render_txt, 0},
{"no-stdout", no_argument, &render_stdout, 0},
{"pdf", no_argument, &render_pdf, 1},
+ {"csv", no_argument, &render_csv, 1},
{"output", required_argument, NULL, 'o'},
{"help", no_argument, NULL, OPT_HELP},
{NULL, 0, NULL, 0},
break;
case OPT_EMPHASIS:
- emphasis = optarg;
+ if (!strcmp (optarg, "bold"))
+ {
+ bold = true;
+ underline = false;
+ }
+ else if (!strcmp (optarg, "underline"))
+ {
+ bold = false;
+ underline = true;
+ }
+ else if (!strcmp (optarg, "none"))
+ {
+ bold = underline = false;
+ }
+ else
+ error (1, 0, "argument to --emphasis must be \"bold\" or "
+ "\"underline\" or \"none\"");
break;
case OPT_BOX:
}
static struct table *
-read_table (FILE *stream, struct table **tables, size_t n_tables)
+read_table (FILE *stream)
{
struct tab_table *tab;
char buffer[1024];
int n_input = 0;
int nr, nc, hl, hr, ht, hb;
int r, c;
+ size_t n_footnotes = 0;
if (fgets (buffer, sizeof buffer, stream) == NULL
|| (n_input = sscanf (buffer, "%d %d %d %d %d %d",
{
unsigned int opt;
char *new_line;
- unsigned int i;
char *text;
int rs, cs;
break;
case '(':
- opt &= ~TAB_ALIGNMENT;
+ opt &= ~TAB_HALIGN;
opt |= TAB_LEFT;
break;
case ')':
- opt &= ~TAB_ALIGNMENT;
+ opt &= ~TAB_HALIGN;
opt |= TAB_RIGHT;
break;
case '|':
- opt &= ~TAB_ALIGNMENT;
+ opt &= ~TAB_HALIGN;
opt |= TAB_CENTER;
break;
replace_newlines (text);
- if (sscanf (text, "{%u}", &i) == 1)
- {
- struct table *table;
-
- if (i >= n_tables)
- error (1, 0, "bad table number %u", i);
- table = table_ref (tables[i]);
-
- text = strchr (text, '}') + 1;
- while (*text)
- switch (*text++)
- {
- case 's':
- table = table_stomp (table);
- break;
-
- case 't':
- table = table_transpose (table);
- break;
-
- default:
- error (1, 0, "unexpected subtable modifier \"%c\"", *text);
- }
- tab_subtable (tab, c, r, c + cs - 1, r + rs - 1, opt, table);
- }
- else
- tab_joint_text (tab, c, r, c + cs - 1, r + rs - 1, opt, text);
+ char *pos = text;
+ char *content;
+ int i;
+
+ for (i = 0; (content = strsep (&pos, "#")) != NULL; i++)
+ if (!i)
+ tab_joint_text (tab, c, r, c + cs - 1, r + rs - 1, opt,
+ content);
+ else
+ {
+ char marker[2] = { 'a' + n_footnotes, '\0' };
+ struct footnote *f = tab_create_footnote (
+ tab, n_footnotes, content, marker, NULL);
+ tab_add_footnote (tab, c, r, f);
+ n_footnotes++;
+ }
}
return &tab->table;
continue;
if (sscanf (buffer, "%d %d %d %[^\n]", &x, &y, &emph, text) == 4)
- ascii_test_write (ascii_driver, text, x, y, emph ? TAB_EMPH : 0);
+ ascii_test_write (ascii_driver, text, x, y, emph ? bold : false,
+ emph ? underline : false);
else if (sscanf (buffer, "set-length %d %d", &y, &length) == 2)
ascii_test_set_length (ascii_driver, y, length);
else
error (1, 0, "line %d has invalid format", line);
}
+ ascii_test_flush (ascii_driver);
}
projects / pspp / blobdiff