/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 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
#include "output/table-item.h"
#include "output/text-item.h"
-#include "error.h"
#include "xalloc.h"
#include "gettext.h"
struct html_driver
{
struct output_driver driver;
-
+#ifdef HAVE_CAIRO
+ struct xr_color fg;
+ struct xr_color bg;
+#endif
char *file_name;
char *chart_file_name;
file_name));
html->file = NULL;
html->chart_cnt = 1;
-
+#ifdef HAVE_CAIRO
+ parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &html->bg);
+ parse_color (d, o, "foreground-color", "#000000000000", &html->fg);
+#endif
html->file = fn_open (html->file_name, "w");
if (html->file == NULL)
{
- error (0, errno, _("error opening output file `%s'"), html->file_name);
+ msg_error (errno, _("error opening output file `%s'"), html->file_name);
goto error;
}
char *file_name;
file_name = xr_draw_png_chart (chart_item, html->chart_file_name,
- html->chart_cnt++);
+ html->chart_cnt++,
+ &html->fg,
+ &html->bg
+ );
if (file_name != NULL)
{
const char *title = chart_item_get_title (chart_item);
if (top > TAL_GAP)
put_border (html->file, n_borders++, top, "top");
- if (y == table_nr (t) - 1)
+ if (y + rowspan == table_nr (t))
{
- bottom = table_get_rule (t, TABLE_VERT, x, y + 1);
+ bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan);
if (bottom > TAL_GAP)
put_border (html->file, n_borders++, bottom, "bottom");
}
if (left > TAL_GAP)
put_border (html->file, n_borders++, left, "left");
- if (x == table_nc (t) - 1)
+ if (x + colspan == table_nc (t))
{
- right = table_get_rule (t, TABLE_HORZ, x + 1, y);
+ right = table_get_rule (t, TABLE_HORZ, x + colspan, y);
if (right > TAL_GAP)
put_border (html->file, n_borders++, right, "right");
}
fputs ("</TABLE>\n\n", html->file);
}
-struct output_driver_factory html_driver_factory = { "html", html_create };
+struct output_driver_factory html_driver_factory =
+ { "html", "pspp.html", html_create };
static const struct output_driver_class html_driver_class =
{