/* --draw-mode: special ASCII driver test mode. */
static int draw_mode;
+/* --no-txt: Whether to render to <base>.txt. */
+static int render_txt = true;
+
+/* --no-stdout: Whether to render to stdout. */
+static int render_stdout = true;
+
/* --pdf: Also render PDF output. */
static int render_pdf;
/* ASCII driver, for ASCII driver test mode. */
static struct output_driver *ascii_driver;
+/* -o, --output: Base name for output files. */
+static const char *output_base = "render";
+
static const char *parse_options (int argc, char **argv);
static void usage (void) NO_RETURN;
-static struct table *read_table (FILE *);
+static struct table *read_table (FILE *, struct table **tables, size_t n_tables);
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 (!draw_mode)
{
+ struct table **tables = NULL;
+ size_t allocated_tables = 0;
+ size_t n_tables = 0;
struct table *table;
- table = read_table (input);
+ for (;;)
+ {
+ int ch;
+
+ if (n_tables >= allocated_tables)
+ tables = x2nrealloc (tables, &allocated_tables, sizeof *tables);
+ tables[n_tables] = read_table (input, tables, n_tables);
+ n_tables++;
+
+ ch = getc (input);
+ if (ch == EOF)
+ break;
+ ungetc (ch, input);
+ }
+
+ table = tables[n_tables - 1];
if (transpose)
table = table_transpose (table);
-
table_item_submit (table_item_create (table, NULL));
}
else
if (input != stdin)
fclose (input);
- output_close ();
+ output_engine_pop ();
return 0;
}
string_map_insert (&options, "box", box);
/* Render to stdout. */
- string_map_clone (&tmp, &options);
- ascii_driver = driver = output_driver_create (&tmp);
- if (driver == NULL)
- exit (EXIT_FAILURE);
- output_driver_register (driver);
- string_map_destroy (&tmp);
+ if (render_stdout)
+ {
+ string_map_clone (&tmp, &options);
+ ascii_driver = driver = output_driver_create (&tmp);
+ if (driver == NULL)
+ exit (EXIT_FAILURE);
+ output_driver_register (driver);
+ string_map_destroy (&tmp);
+ }
if (draw_mode)
{
- string_map_destroy (&options);
- return;
+ string_map_destroy (&options);
+ return;
}
- /* Render to render.txt. */
- string_map_replace (&options, "output-file", "render.txt");
- driver = output_driver_create (&options);
- if (driver == NULL)
- exit (EXIT_FAILURE);
- output_driver_register (driver);
+ /* Render to <base>.txt. */
+ if (render_txt)
+ {
+ string_map_clear (&options);
+ string_map_insert_nocopy (&options, xstrdup ("output-file"),
+ xasprintf ("%s.txt", output_base));
+ driver = output_driver_create (&options);
+ if (driver == NULL)
+ exit (EXIT_FAILURE);
+ output_driver_register (driver);
+ }
#ifdef HAVE_CAIRO
+ /* Render to <base>.pdf. */
if (render_pdf)
{
- string_map_insert (&options, "output-file", "render.pdf");
+ string_map_clear (&options);
+ string_map_insert_nocopy (&options, xstrdup ("output-file"),
+ xasprintf ("%s.pdf", output_base));
string_map_insert (&options, "top-margin", "0");
string_map_insert (&options, "bottom-margin", "0");
string_map_insert (&options, "left-margin", "0");
}
#endif
- string_map_insert (&options, "output-file", "render.odt");
+ /* Render to <base>.odt. */
+ string_map_replace_nocopy (&options, xstrdup ("output-file"),
+ xasprintf ("%s.odt", output_base));
driver = output_driver_create (&options);
if (driver == NULL)
exit (EXIT_FAILURE);
{"emphasis", required_argument, NULL, OPT_EMPHASIS},
{"box", required_argument, NULL, OPT_BOX},
{"draw-mode", no_argument, &draw_mode, 1},
+ {"no-txt", no_argument, &render_txt, 0},
+ {"no-stdout", no_argument, &render_stdout, 0},
{"pdf", no_argument, &render_pdf, 1},
+ {"output", required_argument, NULL, 'o'},
{"help", no_argument, NULL, OPT_HELP},
{NULL, 0, NULL, 0},
};
- int c = getopt_long (argc, argv, "", options, NULL);
+ int c = getopt_long (argc, argv, "o:", options, NULL);
if (c == -1)
break;
box = optarg;
break;
+ case 'o':
+ output_base = optarg;
+ break;
+
case OPT_HELP:
usage ();
}
static struct table *
-read_table (FILE *stream)
+read_table (FILE *stream, struct table **tables, size_t n_tables)
{
struct tab_table *tab;
char buffer[1024];
for (c = 0; c < nc; c++)
if (tab_cell_is_empty (tab, c, r))
{
+ unsigned int opt;
char *new_line;
+ unsigned int i;
char *text;
int rs, cs;
cs = 1;
}
- while (*text && strchr ("<>^,@", *text))
+ opt = 0;
+ while (*text && strchr ("<>^,@()|", *text))
switch (*text++)
{
case '<':
c + cs - 1, r + rs - 1);
break;
+ case '(':
+ opt &= ~TAB_ALIGNMENT;
+ opt |= TAB_LEFT;
+ break;
+
+ case ')':
+ opt &= ~TAB_ALIGNMENT;
+ opt |= TAB_RIGHT;
+ break;
+
+ case '|':
+ opt &= ~TAB_ALIGNMENT;
+ opt |= TAB_CENTER;
+ break;
+
default:
NOT_REACHED ();
}
replace_newlines (text);
- tab_joint_text (tab, c, r, c + cs - 1, r + rs - 1, 0, 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);
}
- if (getc (stream) != EOF)
- error (1, 0, "unread data at end of input");
-
return &tab->table;
}
projects / pspp / blobdiff