projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
po: Update translations from translationproject.org.
[pspp]
/
src
/
output
/
html.c
diff --git
a/src/output/html.c
b/src/output/html.c
index 29a44721d455ae3f0336e1f95d52610e9c5df1c1..e8416756cb910f7c23a44081809b43c65dbcca92 100644
(file)
--- a/
src/output/html.c
+++ b/
src/output/html.c
@@
-39,7
+39,6
@@
#include "output/table-item.h"
#include "output/text-item.h"
#include "output/table-item.h"
#include "output/text-item.h"
-#include "error.h"
#include "xalloc.h"
#include "gettext.h"
#include "xalloc.h"
#include "gettext.h"
@@
-48,7
+47,10
@@
struct html_driver
{
struct output_driver driver;
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;
char *file_name;
char *chart_file_name;
@@
-102,11
+104,14
@@
html_create (const char *file_name, enum settings_output_devices device_type,
file_name));
html->file = NULL;
html->chart_cnt = 1;
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)
{
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;
}
goto error;
}
@@
-239,7
+244,10
@@
html_submit (struct output_driver *driver,
char *file_name;
file_name = xr_draw_png_chart (chart_item, html->chart_file_name,
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 (file_name != NULL)
{
const char *title = chart_item_get_title (chart_item);