/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2017 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
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 <time.h>
#include <unistd.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <data/file-name.h>
-#include "error.h"
-#include "output.h"
-#include "manager.h"
-#include "table.h"
-#include <libpspp/version.h>
-
-#include "xalloc.h"
+#include "data/file-name.h"
+#include "data/file-handle-def.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/version.h"
+#include "output/cairo.h"
+#include "output/chart-item.h"
+#include "output/driver-provider.h"
+#include "output/message-item.h"
+#include "output/options.h"
+#include "output/output-item-provider.h"
+#include "output/table-provider.h"
+#include "output/table-item.h"
+#include "output/text-item.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-/* HTML driver options: (defaults listed first)
+struct html_driver
+ {
+ struct output_driver driver;
+#ifdef HAVE_CAIRO
+ struct cell_color fg;
+ struct cell_color bg;
+#endif
+ struct file_handle *handle;
+ char *chart_file_name;
+
+ FILE *file;
+ size_t chart_cnt;
+
+ bool css;
+ bool borders;
+ };
- output-file="pspp.html"
- chart-files="pspp-#.png"
-*/
+static const struct output_driver_class html_driver_class;
+static void html_output_table (struct html_driver *, const struct table_item *);
static void escape_string (FILE *file,
const char *text, size_t length,
- const char *space);
-static bool handle_option (struct outp_driver *this,
- const char *key, const struct string *val);
+ const char *space, const char *newline);
static void print_title_tag (FILE *file, const char *name,
const char *content);
-static bool
-html_open_driver (struct outp_driver *this, struct substring options)
+static struct html_driver *
+html_driver_cast (struct output_driver *driver)
{
- struct html_driver_ext *x;
-
- this->ext = x = xmalloc (sizeof *x);
- x->file_name = xstrdup ("pspp.html");
- x->chart_file_name = xstrdup ("pspp-#.png");
- x->file = NULL;
- x->chart_cnt = 0;
+ assert (driver->class == &html_driver_class);
+ return UP_CAST (driver, struct html_driver, driver);
+}
- outp_parse_options (options, handle_option, this);
+static struct driver_option *
+opt (struct output_driver *d, struct string_map *options, const char *key,
+ const char *default_value)
+{
+ return driver_option_get (d, options, key, default_value);
+}
- x->file = fn_open (x->file_name, "w");
- if (x->file == NULL)
+static struct output_driver *
+html_create (struct file_handle *fh, enum settings_output_devices device_type,
+ struct string_map *o)
+{
+ struct output_driver *d;
+ struct html_driver *html;
+
+ html = xzalloc (sizeof *html);
+ d = &html->driver;
+ output_driver_init (&html->driver, &html_driver_class, fh_get_file_name (fh),
+ device_type);
+ html->css = parse_boolean (opt (d, o, "css", "true"));
+ html->borders = parse_boolean (opt (d, o, "borders", "true"));
+
+ html->handle = fh;
+ html->chart_file_name = parse_chart_file_name (opt (d, o, "charts",
+ fh_get_file_name (fh)));
+ 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->handle, "w");
+ if (html->file == NULL)
{
- error (0, errno, _("opening HTML output file: %s"), x->file_name);
+ msg_error (errno, _("error opening output file `%s'"), fh_get_file_name (html->handle));
goto error;
}
fputs ("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n"
- " \"http://www.w3.org/TR/html4/loose.dtd\">\n", x->file);
- fputs ("<HTML>\n", x->file);
- fputs ("<HEAD>\n", x->file);
- /* The <TITLE> tag is required, so we use a default if the user
- didn't provide one. */
- print_title_tag (x->file,
- "TITLE", outp_title ? outp_title : _("PSPP Output"));
- fprintf (x->file, "<META NAME=\"generator\" CONTENT=\"%s\">\n", version);
+ " \"http://www.w3.org/TR/html4/loose.dtd\">\n", html->file);
+ fputs ("<HTML>\n", html->file);
+ fputs ("<HEAD>\n", html->file);
+ print_title_tag (html->file, "TITLE", _("PSPP Output"));
+ fprintf (html->file, "<META NAME=\"generator\" CONTENT=\"%s\">\n", version);
fputs ("<META HTTP-EQUIV=\"Content-Type\" "
- "CONTENT=\"text/html; charset=ISO-8859-1\">\n", x->file);
- fputs ("</HEAD>\n", x->file);
- fputs ("<BODY BGCOLOR=\"#ffffff\" TEXT=\"#000000\"\n", x->file);
- 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);
+ "CONTENT=\"text/html; charset=utf-8\">\n", html->file);
+
+ if ( html->css)
+ {
+ fputs ("<META http-equiv=\"Content-Style-Type\" content=\"text/css\">\n",
+ html->file);
+ fputs ("<STYLE TYPE=\"text/css\">\n"
+ "<!--\n"
+ "body {\n"
+ " background: white;\n"
+ " color: black;\n"
+ " padding: 0em 12em 0em 3em;\n"
+ " margin: 0\n"
+ "}\n"
+ "body>p {\n"
+ " margin: 0pt 0pt 0pt 0em\n"
+ "}\n"
+ "body>p + p {\n"
+ " text-indent: 1.5em;\n"
+ "}\n"
+ "h1 {\n"
+ " font-size: 150%;\n"
+ " margin-left: -1.33em\n"
+ "}\n"
+ "h2 {\n"
+ " font-size: 125%;\n"
+ " font-weight: bold;\n"
+ " margin-left: -.8em\n"
+ "}\n"
+ "h3 {\n"
+ " font-size: 100%;\n"
+ " font-weight: bold;\n"
+ " margin-left: -.5em }\n"
+ "h4 {\n"
+ " font-size: 100%;\n"
+ " margin-left: 0em\n"
+ "}\n"
+ "h1, h2, h3, h4, h5, h6 {\n"
+ " font-family: sans-serif;\n"
+ " color: blue\n"
+ "}\n"
+ "html {\n"
+ " margin: 0\n"
+ "}\n"
+ "code {\n"
+ " font-family: sans-serif\n"
+ "}\n"
+ "table {\n"
+ " border-collapse: collapse;\n"
+ " margin-bottom: 1em\n"
+ "}\n"
+ "th { background: #dddddd; font-weight: normal; font-style: oblique }\n"
+ "caption {\n"
+ " text-align: left\n"
+ "}\n"
+ "-->\n"
+ "</STYLE>\n",
+ html->file);
+ }
+ fputs ("</HEAD>\n", html->file);
+ fputs ("<BODY BGCOLOR=\"#ffffff\" TEXT=\"#000000\"\n", html->file);
+ fputs (" LINK=\"#1f00ff\" ALINK=\"#ff0000\" VLINK=\"#9900dd\">\n", html->file);
- return true;
+ return d;
error:
- this->class->close_driver (this);
- return false;
+ output_driver_destroy (d);
+ return NULL;
}
/* Emits <NAME>CONTENT</NAME> to the output, escaping CONTENT as
{
if (content != NULL)
{
- fprintf (file, "<%s>", name);
- escape_string (file, content, strlen (content), " ");
+ fprintf (file, "<%s>", name);
+ escape_string (file, content, strlen (content), " ", " - ");
fprintf (file, "</%s>\n", name);
}
}
-static bool
-html_close_driver (struct outp_driver *this)
+static void
+html_destroy (struct output_driver *driver)
{
- struct html_driver_ext *x = this->ext;
- bool ok;
+ struct html_driver *html = html_driver_cast (driver);
- if (x->file != NULL)
+ if (html->file != NULL)
{
- fprintf (x->file,
+ fprintf (html->file,
"</BODY>\n"
"</HTML>\n"
"<!-- end of file -->\n");
- ok = fn_close (x->file_name, x->file) == 0;
- x->file = NULL;
+ fn_close (html->handle, html->file);
}
- else
- ok = true;
- free (x->chart_file_name);
- free (x->file_name);
- free (x);
-
- return ok;
+ free (html->chart_file_name);
+ fh_unref (html->handle);
+ free (html);
}
-/* Link the image contained in FILE_NAME to the
- HTML stream in FILE. */
static void
-link_image (FILE *file, char *file_name)
+html_submit (struct output_driver *driver,
+ const struct output_item *output_item)
{
- fprintf (file, "<IMG SRC=\"%s\"/>", file_name);
- }
+ struct html_driver *html = html_driver_cast (driver);
-/* Generic option types. */
-enum
- {
- string_arg,
- nonneg_int_arg
- };
-
-/* All the options that the HTML driver supports. */
-static const struct outp_option option_tab[] =
- {
- {"output-file", string_arg, 0},
- {"chart-files", string_arg, 1},
- {NULL, 0, 0},
- };
-
-static bool
-handle_option (struct outp_driver *this,
- const char *key, const struct string *val)
-{
- struct html_driver_ext *x = this->ext;
- int subcat;
-
- switch (outp_match_keyword (key, option_tab, &subcat))
+ if (is_table_item (output_item))
{
- case -1:
- error (0, 0,
- _("unknown configuration parameter `%s' for HTML device driver"),
- key);
- break;
- case string_arg:
- switch (subcat)
+ struct table_item *table_item = to_table_item (output_item);
+ html_output_table (html, table_item);
+ }
+#ifdef HAVE_CAIRO
+ else if (is_chart_item (output_item) && html->chart_file_name != NULL)
+ {
+ struct chart_item *chart_item = to_chart_item (output_item);
+ char *file_name;
+
+ file_name = xr_draw_png_chart (chart_item, html->chart_file_name,
+ html->chart_cnt++,
+ &html->fg,
+ &html->bg
+ );
+ if (file_name != NULL)
{
- case 0:
- free (x->file_name);
- x->file_name = ds_xstrdup (val);
- break;
- case 1:
- if (ds_find_char (val, '#') != SIZE_MAX)
- {
- free (x->chart_file_name);
- x->chart_file_name = ds_xstrdup (val);
- }
- else
- error (0, 0, _("`chart-files' value must contain `#'"));
- break;
- default:
- NOT_REACHED ();
+ const char *title = chart_item_get_title (chart_item);
+ fprintf (html->file, "<IMG SRC=\"%s\" ALT=\"Chart: %s\">",
+ file_name, title ? title : _("No description"));
+ free (file_name);
}
- break;
- default:
- NOT_REACHED ();
}
+#endif /* HAVE_CAIRO */
+ else if (is_text_item (output_item))
+ {
+ struct text_item *text_item = to_text_item (output_item);
+ const char *s = text_item_get_text (text_item);
- return true;
-}
+ switch (text_item_get_type (text_item))
+ {
+ case TEXT_ITEM_PAGE_TITLE:
+ break;
-static void output_tab_table (struct outp_driver *, struct tab_table *);
+ case TEXT_ITEM_TITLE:
+ {
+ int level = MIN (5, output_get_group_level ()) + 1;
+ char tag[3] = { 'H', level + '1', '\0' };
+ print_title_tag (html->file, tag, s);
+ }
+ break;
-static void
-html_submit (struct outp_driver *this, struct som_entity *s)
-{
- extern struct som_table_class tab_table_class;
- struct html_driver_ext *x = this->ext;
+ case TEXT_ITEM_SYNTAX:
+ fprintf (html->file, "<PRE class=\"syntax\">");
+ escape_string (html->file, s, strlen (s), " ", "<BR>");
+ fprintf (html->file, "</PRE>\n");
+ break;
- assert (s->class == &tab_table_class ) ;
+ case TEXT_ITEM_LOG:
+ print_title_tag (html->file, "PRE", s); /* should be <P><TT> */
+ break;
- switch (s->type)
+ case TEXT_ITEM_EJECT_PAGE:
+ /* Nothing to do. */
+ break;
+ }
+ }
+ else if (is_message_item (output_item))
{
- case SOM_TABLE:
- output_tab_table ( this, (struct tab_table *) s->ext);
- break;
- case SOM_CHART:
- link_image (x->file, ((struct chart *)s->ext)->file_name);
- break;
- default:
- NOT_REACHED ();
+ const struct message_item *message_item = to_message_item (output_item);
+ char *s = msg_to_string (message_item_get_msg (message_item));
+ print_title_tag (html->file, "P", s);
+ free (s);
}
}
-/* Write LENGTH characters in TEXT to file F, escaping characters
- as necessary for HTML. Spaces are replaced by SPACE, which
- should be " " or " ". */
+/* Write LENGTH characters in TEXT to file F, escaping characters as necessary
+ for HTML. Spaces are replaced by SPACE, which should be " " or " "
+ New-lines are replaced by NEWLINE, which might be "<BR>" or "\n" or
+ something else appropriate. */
static void
escape_string (FILE *file,
const char *text, size_t length,
- const char *space)
+ const char *space, const char *newline)
{
while (length-- > 0)
{
char c = *text++;
switch (c)
{
+ case '\n':
+ fputs (newline, file);
+ break;
case '&':
fputs ("&", file);
break;
case ' ':
fputs (space, file);
break;
+ case '"':
+ fputs (""", file);
+ break;
default:
putc (c, file);
break;
}
}
-/* Outputs content for a cell with options OPTS and contents
- TEXT. */
-void
-html_put_cell_contents (struct outp_driver *this,
- unsigned int opts, const struct substring text)
+static const char *
+border_to_css (int border)
{
- struct html_driver_ext *x = this->ext;
-
- if (!(opts & TAB_EMPTY))
+ switch (border)
{
- if (opts & TAB_EMPH)
- fputs ("<EM>", x->file);
- if (opts & TAB_FIX)
- {
- fputs ("<TT>", x->file);
- escape_string (x->file, ss_data (text), ss_length (text), " ");
- fputs ("</TT>", x->file);
- }
- else
- {
- size_t initial_spaces = ss_span (text, ss_cstr (CC_SPACES));
- escape_string (x->file,
- ss_data (text) + initial_spaces,
- ss_length (text) - initial_spaces,
- " ");
- }
- if (opts & TAB_EMPH)
- fputs ("</EM>", x->file);
+ case TAL_NONE:
+ return NULL;
+
+ case TAL_SOLID:
+ return "solid";
+
+ case TAL_DASHED:
+ return "dashed";
+
+ case TAL_THICK:
+ return "thick solid";
+
+ case TAL_THIN:
+ return "thin solid";
+
+ case TAL_DOUBLE:
+ return "double";
+
+ default:
+ return NULL;
}
+
}
-/* Write table T to THIS output driver. */
static void
-output_tab_table (struct outp_driver *this, struct tab_table *t)
+put_border (FILE *file, int *n_borders, int style, const char *border_name)
{
- struct html_driver_ext *x = this->ext;
-
- if (t->nr == 1 && t->nc == 1)
+ const char *css = border_to_css (style);
+ if (css)
{
- fputs ("<P>", x->file);
- html_put_cell_contents (this, t->ct[0], *t->cc);
- fputs ("</P>\n", x->file);
-
- return;
+ fprintf (file, "%sborder-%s: %s",
+ (*n_borders)++ == 0 ? " STYLE=\"" : "; ",
+ border_name, css);
}
+}
- fputs ("<TABLE BORDER=1>\n", x->file);
-
- if (t->title != NULL)
+static void
+put_tfoot (struct html_driver *html, const struct table *t, bool *tfoot)
+{
+ if (!*tfoot)
{
- fprintf (x->file, " <CAPTION>");
- escape_string (x->file, t->title, strlen (t->title), " ");
- fputs ("</CAPTION>\n", x->file);
+ fprintf (html->file, "<TFOOT><TR><TD COLSPAN=%d>", table_nc (t));
+ *tfoot = true;
}
+ else
+ fputs ("\n<BR>", html->file);
+}
- {
- int r;
- unsigned char *ct = t->ct;
-
- for (r = 0; r < t->nr; r++)
- {
- int c;
-
- fputs (" <TR>\n", x->file);
- for (c = 0; c < t->nc; c++, ct++)
- {
- struct substring *cc;
- const char *tag;
- struct tab_joined_cell *j = NULL;
-
- cc = t->cc + c + r * t->nc;
- if (*ct & TAB_JOIN)
- {
- j = (struct tab_joined_cell *) ss_data (*cc);
- cc = &j->contents;
- if (j->x1 != c || j->y1 != r)
- continue;
- }
-
- /* Output <TD> or <TH> tag. */
- tag = (r < t->t || r >= t->nr - t->b
- || c < t->l || c >= t->nc - t->r) ? "TH" : "TD";
- fprintf (x->file, " <%s ALIGN=%s",
- tag,
- (*ct & TAB_ALIGN_MASK) == TAB_LEFT ? "LEFT"
- : (*ct & TAB_ALIGN_MASK) == TAB_RIGHT ? "RIGHT"
- : "CENTER");
- if (*ct & TAB_JOIN)
- {
- if (j->x2 - j->x1 > 1)
- fprintf (x->file, " COLSPAN=%d", j->x2 - j->x1);
- if (j->y2 - j->y1 > 1)
- fprintf (x->file, " ROWSPAN=%d", j->y2 - j->y1);
- }
- putc ('>', x->file);
-
- /* Output cell contents. */
- html_put_cell_contents (this, *ct, *cc);
-
- /* Output </TH> or </TD>. */
- fprintf (x->file, "</%s>\n", tag);
- }
- fputs (" </TR>\n", x->file);
- }
- }
-
- fputs ("</TABLE>\n\n", x->file);
+static void
+html_put_footnote_markers (struct html_driver *html,
+ const struct footnote **footnotes,
+ size_t n_footnotes)
+{
+ if (n_footnotes > 0)
+ {
+ fputs ("<SUP>", html->file);
+ for (size_t i = 0; i < n_footnotes; i++)
+ {
+ const struct footnote *f = footnotes[i];
+
+ if (i > 0)
+ putc (',', html->file);
+ escape_string (html->file, f->marker,
+ strlen (f->marker), " ", "<BR>");
+ }
+ fputs ("</SUP>", html->file);
+ }
}
static void
-html_initialise_chart (struct outp_driver *this UNUSED, struct chart *ch)
+html_put_table_item_text (struct html_driver *html,
+ const struct table_item_text *text)
{
- struct html_driver_ext *x = this->ext;
- chart_init_separate (ch, "png", x->chart_file_name, ++x->chart_cnt);
+ escape_string (html->file, text->content, strlen (text->content),
+ " ", "<BR>");
+ html_put_footnote_markers (html, text->footnotes, text->n_footnotes);
}
static void
-html_finalise_chart(struct outp_driver *d UNUSED, struct chart *ch)
+html_put_table_item_layers (struct html_driver *html,
+ const struct table_item_layers *layers)
{
- chart_finalise_separate (ch);
+ for (size_t i = 0; i < layers->n_layers; i++)
+ {
+ if (i)
+ fputs ("<BR>\n", html->file);
+
+ const struct table_item_layer *layer = &layers->layers[i];
+ escape_string (html->file, layer->content, strlen (layer->content),
+ " ", "<BR>");
+ html_put_footnote_markers (html, layer->footnotes, layer->n_footnotes);
+ }
}
+static void
+html_output_table (struct html_driver *html, const struct table_item *item)
+{
+ const struct table *t = table_item_get_table (item);
+ bool tfoot = false;
+ int y;
+ fputs ("<TABLE>", html->file);
-/* HTML driver class. */
-const struct outp_class html_class =
- {
- "html",
- 1,
+ const struct table_item_text *caption = table_item_get_caption (item);
+ if (caption)
+ {
+ put_tfoot (html, t, &tfoot);
+ html_put_table_item_text (html, caption);
+ }
+ const struct footnote **f;
+ size_t n_footnotes = table_collect_footnotes (item, &f);
- html_open_driver,
- html_close_driver,
+ for (size_t i = 0; i < n_footnotes; i++)
+ {
+ put_tfoot (html, t, &tfoot);
+ fputs ("<SUP>", html->file);
+ escape_string (html->file, f[i]->marker, strlen (f[i]->marker),
+ " ", "<BR>");
+ fputs ("</SUP> ", html->file);
+ escape_string (html->file, f[i]->content, strlen (f[i]->content),
+ " ", "<BR>");
+ }
+ free (f);
+ if (tfoot)
+ fputs ("</TD></TR></TFOOT>\n", html->file);
- NULL,
- NULL,
- NULL,
+ fputs ("<TBODY VALIGN=\"TOP\">\n", html->file);
- html_submit,
+ const struct table_item_text *title = table_item_get_title (item);
+ const struct table_item_layers *layers = table_item_get_layers (item);
+ if (title || layers)
+ {
+ fputs (" <CAPTION>", html->file);
+ if (title)
+ html_put_table_item_text (html, title);
+ if (title && layers)
+ fputs ("<BR>\n", html->file);
+ if (layers)
+ html_put_table_item_layers (html, layers);
+ fputs ("</CAPTION>\n", html->file);
+ }
+ for (y = 0; y < table_nr (t); y++)
+ {
+ int x;
+
+ fputs (" <TR>\n", html->file);
+ for (x = 0; x < table_nc (t); )
+ {
+ struct table_cell cell;
+ const char *tag;
+ bool is_header;
+ int colspan, rowspan;
+ int top, left, right, bottom;
+
+ table_get_cell (t, x, y, &cell);
+ if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0])
+ goto next_1;
+
+ /* Output <TD> or <TH> tag. */
+ is_header = (y < table_ht (t)
+ || y >= table_nr (t) - table_hb (t)
+ || x < table_hl (t)
+ || x >= table_nc (t) - table_hr (t));
+ tag = is_header ? "TH" : "TD";
+ fprintf (html->file, " <%s", tag);
+
+ enum table_halign halign = table_halign_interpret (
+ cell.style->cell_style.halign, cell.options & TAB_NUMERIC);
+ if (halign != TABLE_HALIGN_LEFT)
+ {
+ fprintf (html->file, " ALIGN=\"%s\"",
+ (halign == TABLE_HALIGN_RIGHT ? "RIGHT"
+ : halign == TABLE_HALIGN_CENTER ? "CENTER"
+ : "CHAR"));
+ if (cell.style->cell_style.decimal_char)
+ fprintf (html->file, " CHAR=\"%c\"",
+ cell.style->cell_style.decimal_char);
+ }
+
+ if (cell.style->cell_style.valign != TABLE_VALIGN_TOP)
+ fprintf (html->file, " ALIGN=\"%s\"",
+ (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM
+ ? "BOTTOM" : "MIDDLE"));
+
+ colspan = table_cell_colspan (&cell);
+ if (colspan > 1)
+ fprintf (html->file, " COLSPAN=\"%d\"", colspan);
+
+ rowspan = table_cell_rowspan (&cell);
+ if (rowspan > 1)
+ fprintf (html->file, " ROWSPAN=\"%d\"", rowspan);
+
+ if (html->borders)
+ {
+ /* Cell borders. */
+ int n_borders = 0;
+
+ struct cell_color color;
+ top = table_get_rule (t, TABLE_VERT, x, y, &color);
+ put_border (html->file, &n_borders, top, "top");
+
+ if (y + rowspan == table_nr (t))
+ {
+ bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan,
+ &color);
+ put_border (html->file, &n_borders, bottom, "bottom");
+ }
+
+ left = table_get_rule (t, TABLE_HORZ, x, y, &color);
+ put_border (html->file, &n_borders, left, "left");
+
+ if (x + colspan == table_nc (t))
+ {
+ right = table_get_rule (t, TABLE_HORZ, x + colspan, y,
+ &color);
+ put_border (html->file, &n_borders, right, "right");
+ }
+
+ if (n_borders > 0)
+ fputs ("\"", html->file);
+ }
+
+ putc ('>', html->file);
+
+ /* Output cell contents. */
+ const char *s = cell.text;
+ if (cell.options & TAB_FIX)
+ {
+ fputs ("<TT>", html->file);
+ escape_string (html->file, s, strlen (s), " ", "<BR>");
+ fputs ("</TT>", html->file);
+ }
+ else
+ {
+ s += strspn (s, CC_SPACES);
+ escape_string (html->file, s, strlen (s), " ", "<BR>");
+ }
+
+ html_put_footnote_markers (html, cell.footnotes, cell.n_footnotes);
+
+ /* Output </TH> or </TD>. */
+ fprintf (html->file, "</%s>\n", tag);
+
+ next_1:
+ x = cell.d[TABLE_HORZ][1];
+ table_cell_free (&cell);
+ }
+ fputs (" </TR>\n", html->file);
+ }
+
+ fputs ("</TBODY></TABLE>\n\n", html->file);
+}
+
+struct output_driver_factory html_driver_factory =
+ { "html", "pspp.html", html_create };
+
+static const struct output_driver_class html_driver_class =
+ {
+ "html",
+ html_destroy,
+ html_submit,
NULL,
- NULL,
- NULL,
- html_initialise_chart,
- html_finalise_chart
};