-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "chart.h"
#include "htmlP.h"
#include <errno.h>
+#include <stdint.h>
#include <stdlib.h>
#include <ctype.h>
#include <time.h>
#include <unistd.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <data/file-name.h>
#include "error.h"
-#include "getline.h"
#include "output.h"
#include "manager.h"
#include "table.h"
#include <libpspp/version.h>
-#include "size_max.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
+/* HTML driver options: (defaults listed first)
+
+ output-file="pspp.html"
+ chart-files="pspp-#.png"
+*/
+
static void escape_string (FILE *file,
const char *text, size_t length,
const char *space);
fputs (" LINK=\"#1f00ff\" ALINK=\"#ff0000\" VLINK=\"#9900dd\">\n", x->file);
print_title_tag (x->file, "H1", outp_title);
print_title_tag (x->file, "H2", outp_subtitle);
- free (x->chart_file_name);
return true;
error:
- free (x->chart_file_name);
this->class->close_driver (this);
return false;
}
}
else
ok = true;
+ free (x->chart_file_name);
free (x->file_name);
free (x);
free (x->chart_file_name);
x->chart_file_name = ds_xstrdup (val);
}
- error (0, 0, _("`chart-files' value must contain `#'"));
+ else
+ error (0, 0, _("`chart-files' value must contain `#'"));
break;
default:
NOT_REACHED ();
static void
html_initialise_chart (struct outp_driver *this UNUSED, struct chart *ch)
{
-#ifdef NO_CHARTS
- ch->lp = NULL;
-#else
struct html_driver_ext *x = this->ext;
-
- FILE *fp;
- int number_pos;
-
- x->chart_cnt++;
-
- number_pos = strchr (x->chart_file_name, '#') - x->chart_file_name;
- ch->file_name = xasprintf ("%.*s%d%s",
- number_pos, x->chart_file_name,
- (int) x->chart_cnt,
- x->chart_file_name + number_pos + 1);
- fp = fopen (ch->file_name, "wb");
- if (fp == NULL)
- {
- error (0, errno, _("creating \"%s\""), ch->file_name);
- free (ch->file_name);
- ch->file_name = NULL;
- return;
- }
-
- ch->pl_params = pl_newplparams ();
- ch->lp = pl_newpl_r ("png", 0, fp, stderr, ch->pl_params);
-#endif
+ chart_init_separate (ch, "png", x->chart_file_name, ++x->chart_cnt);
}
static void
html_finalise_chart(struct outp_driver *d UNUSED, struct chart *ch)
{
- free(ch->file_name);
+ chart_finalise_separate (ch);
}
html_open_driver,
html_close_driver,
+ NULL,
NULL,
NULL,