/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2017,
+ 2020 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 <ctype.h>
#include <time.h>
#include <unistd.h>
-
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <data/file-name.h>
-#include <output/chart-provider.h>
-#include <output/output.h>
-#include <output/manager.h>
-#include <output/table.h>
-#include <libpspp/version.h>
-
-#include "error.h"
-#include "xalloc.h"
+#include <locale.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/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/version.h"
+#include "output/cairo-chart.h"
+#include "output/chart.h"
+#include "output/driver-provider.h"
+#include "output/options.h"
+#include "output/output-item.h"
+#include "output/pivot-output.h"
+#include "output/pivot-table.h"
+#include "output/table-provider.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-/* HTML driver options: (defaults listed first)
+/* This file uses TABLE_HORZ and TABLE_VERT enough to warrant abbreviating. */
+#define H TABLE_HORZ
+#define V TABLE_VERT
+
+struct html_driver
+ {
+ struct output_driver driver;
+ struct cell_color fg;
+ struct cell_color bg;
+ struct file_handle *handle;
+ char *chart_file_name;
+
+ FILE *file;
+ size_t n_charts;
+
+ bool bare;
+ bool css;
+ bool borders;
+ };
- output-file="pspp.html"
- chart-files="pspp-#.png"
-*/
+static const struct output_driver_class html_driver_class;
-static void escape_string (FILE *file,
- const char *text, size_t length,
- const char *space);
-static bool handle_option (void *this,
- const char *key, const struct string *val);
+static void html_output_table (struct html_driver *,
+ const struct output_item *);
+static void escape_string (FILE *file, const char *text,
+ const char *space, const char *newline);
static void print_title_tag (FILE *file, const char *name,
const char *content);
-static bool
-html_open_driver (const char *name, int types, struct substring options)
+static struct html_driver *
+html_driver_cast (struct output_driver *driver)
{
- struct outp_driver *this;
- struct html_driver_ext *x;
+ assert (driver->class == &html_driver_class);
+ return UP_CAST (driver, struct html_driver, driver);
+}
- this = outp_allocate_driver (&html_class, name, types);
- 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 = 1;
+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);
+}
- outp_parse_options (name, options, handle_option, this);
+static void
+put_header (struct html_driver *html)
+{
+ fputs ("<!doctype html>\n", html->file);
+ fprintf (html->file, "<html");
+ char *ln = get_language ();
+ if (ln)
+ fprintf (html->file, " lang=\"%s\"", ln);
+ free (ln);
+ fprintf (html->file, ">\n");
+ 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=utf-8\">\n", html->file);
+
+ if (html->css)
+ {
+ fputs ("<style>\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"
+ "caption {\n"
+ " text-align: left\n"
+ "}\n"
+ "th { font-weight: normal }\n"
+ "a:link {\n"
+ " color: #1f00ff;\n"
+ "}\n"
+ "a:visited {\n"
+ " color: #9900dd;\n"
+ "}\n"
+ "a:active {\n"
+ " color: red;\n"
+ "}\n"
+ "-->\n"
+ "</style>\n",
+ html->file);
+ }
+ fputs ("</head>\n", html->file);
+ fputs ("<body>\n", html->file);
+}
- 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 = XZALLOC (struct html_driver);
+ d = &html->driver;
+ output_driver_init (&html->driver, &html_driver_class, fh_get_file_name (fh),
+ device_type);
+ html->bare = parse_boolean (opt (d, o, "bare", "false"));
+ 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->n_charts = 1;
+ html->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF"));
+ html->fg = parse_color (opt (d, o, "foreground-color", "#000000000000"));
+ 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);
- 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);
-
- outp_register_driver (this);
- return true;
+ if (!html->bare)
+ put_header (html);
+
+ return d;
error:
- this->class->close_driver (this);
- outp_free_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, " ", " - ");
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,
- "</BODY>\n"
- "</HTML>\n"
- "<!-- end of file -->\n");
- ok = fn_close (x->file_name, x->file) == 0;
- x->file = NULL;
+ if (!html->bare)
+ fprintf (html->file,
+ "</body>\n"
+ "</html>\n"
+ "<!-- end of file -->\n");
+ 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 *item,
+ int level)
{
- fprintf (file, "<IMG SRC=\"%s\"/>", file_name);
- }
-
-/* Generic option types. */
-enum
- {
- string_arg,
- nonneg_int_arg
- };
+ struct html_driver *html = html_driver_cast (driver);
-/* 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 (void *this_, const char *key, const struct string *val)
-{
- struct outp_driver *this = this_;
- struct html_driver_ext *x = this->ext;
- int subcat;
-
- switch (outp_match_keyword (key, option_tab, &subcat))
+ switch (item->type)
{
- case -1:
- error (0, 0,
- _("unknown configuration parameter `%s' for HTML device driver"),
- key);
+ case OUTPUT_ITEM_CHART:
+ if (html->chart_file_name)
+ {
+ char *file_name = xr_draw_png_chart (item->chart,
+ html->chart_file_name,
+ html->n_charts++,
+ &html->fg, &html->bg);
+ if (file_name != NULL)
+ {
+ const char *title = chart_get_title (item->chart);
+ fprintf (html->file, "<img src=\"%s\" alt=\"chart: %s\">",
+ file_name, title ? title : _("No description"));
+ free (file_name);
+ }
+ }
+ break;
+
+ case OUTPUT_ITEM_GROUP:
+ for (size_t i = 0; i < item->group.n_children; i++)
+ html_submit__ (driver, item->group.children[i], level + 1);
break;
- case string_arg:
- switch (subcat)
+
+ case OUTPUT_ITEM_IMAGE:
+ if (html->chart_file_name)
{
- case 0:
- free (x->file_name);
- x->file_name = ds_xstrdup (val);
- break;
- case 1:
- if (ds_find_char (val, '#') != SIZE_MAX)
+ char *file_name = xr_write_png_image (
+ item->image, html->chart_file_name, ++html->n_charts);
+ if (file_name != NULL)
{
- free (x->chart_file_name);
- x->chart_file_name = ds_xstrdup (val);
+ fprintf (html->file, "<img src=\"%s\">", file_name);
+ free (file_name);
}
- else
- error (0, 0, _("`chart-files' value must contain `#'"));
- break;
- default:
- NOT_REACHED ();
}
break;
- default:
- NOT_REACHED ();
- }
- return true;
-}
+ case OUTPUT_ITEM_MESSAGE:
+ fprintf (html->file, "<p>");
-static void output_tab_table (struct outp_driver *, struct tab_table *);
+ char *s = msg_to_string (item->message);
+ escape_string (html->file, s, " ", "<br>");
+ free (s);
-static void
-html_output_chart (struct outp_driver *this, const struct chart *chart)
-{
- struct html_driver_ext *x = this->ext;
- struct chart_geometry geom;
- char *file_name;
- plPlotter *lp;
-
- /* Draw chart in separate file. */
- if (!chart_create_file ("png", x->chart_file_name, x->chart_cnt,
- NULL, &file_name, &lp))
- return;
- x->chart_cnt++;
- chart_geometry_init (lp, &geom, 1000.0, 1000.0);
- chart_draw (chart, lp, &geom);
- chart_geometry_free (lp);
- pl_deletepl_r (lp);
-
- link_image (x->file, file_name);
-
- free (file_name);
-}
+ fprintf (html->file, "</p>\n");
+ break;
-static void
-html_submit (struct outp_driver *this, struct som_entity *s)
-{
- extern struct som_table_class tab_table_class;
+ case OUTPUT_ITEM_PAGE_BREAK:
+ break;
- assert (s->class == &tab_table_class ) ;
+ case OUTPUT_ITEM_TABLE:
+ html_output_table (html, item);
+ break;
- switch (s->type)
- {
- case SOM_TABLE:
- output_tab_table ( this, (struct tab_table *) s->ext);
+ case OUTPUT_ITEM_TEXT:
+ {
+ char *s = text_item_get_plain_text (item);
+
+ switch (item->text.subtype)
+ {
+ case TEXT_ITEM_PAGE_TITLE:
+ break;
+
+ case TEXT_ITEM_TITLE:
+ {
+ char tag[3] = { 'H', MIN (5, level) + '0', '\0' };
+ print_title_tag (html->file, tag, s);
+ }
+ break;
+
+ case TEXT_ITEM_SYNTAX:
+ fprintf (html->file, "<pre class=\"syntax\">");
+ escape_string (html->file, s, " ", "<br>");
+ fprintf (html->file, "</pre>\n");
+ break;
+
+ case TEXT_ITEM_LOG:
+ fprintf (html->file, "<p>");
+ escape_string (html->file, s, " ", "<br>");
+ fprintf (html->file, "</p>\n");
+ break;
+ }
+
+ free (s);
+ }
break;
- default:
- NOT_REACHED ();
}
}
-/* Write LENGTH characters in TEXT to file F, escaping characters
- as necessary for HTML. Spaces are replaced by SPACE, which
- should be " " or " ". */
static void
-escape_string (FILE *file,
- const char *text, size_t length,
- const char *space)
+html_submit (struct output_driver *driver, const struct output_item *item)
{
- while (length-- > 0)
+ html_submit__ (driver, item, 1);
+}
+
+/* Write 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,
+ const char *space, const char *newline)
+{
+ for (;;)
{
char c = *text++;
switch (c)
{
+ case 0:
+ return;
+ 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)
+{
+ switch (border)
+ {
+ case TABLE_STROKE_NONE:
+ return NULL;
+
+ case TABLE_STROKE_SOLID:
+ return "solid";
+
+ case TABLE_STROKE_DASHED:
+ return "dashed";
+
+ case TABLE_STROKE_THICK:
+ return "thick solid";
+
+ case TABLE_STROKE_THIN:
+ return "thin solid";
+
+ case TABLE_STROKE_DOUBLE:
+ return "double";
+
+ default:
+ return NULL;
+ }
+
+}
+
+struct css_style
+{
+ FILE *file;
+ int n_styles;
+};
+
+static void
+style_start (struct css_style *cs, FILE *file)
{
- struct html_driver_ext *x = this->ext;
+ *cs = (struct css_style) {
+ .file = file,
+ .n_styles = 0,
+ };
+}
- if (!(opts & TAB_EMPTY))
+static void
+style_end (struct css_style *cs)
+{
+ if (cs->n_styles > 0)
+ fputs ("'", cs->file);
+}
+
+static void
+next_style (struct css_style *st)
+{
+ bool first = !st->n_styles++;
+ fputs (first ? " style='" : "; ", st->file);
+}
+
+static void
+put_style (struct css_style *st, const char *name, const char *value)
+{
+ next_style (st);
+ fprintf (st->file, "%s: %s", name, value);
+}
+
+static bool
+format_color (const struct cell_color color,
+ const struct cell_color default_color,
+ char *buf, size_t bufsize)
+{
+ bool retval = !cell_color_equal (&color, &default_color);
+ if (retval)
+ {
+ if (color.alpha == 255)
+ snprintf (buf, bufsize, "#%02x%02x%02x", color.r, color.g, color.b);
+ else
+ snprintf (buf, bufsize, "rgba(%d, %d, %d, %.3f)",
+ color.r, color.g, color.b, color.alpha / 255.0);
+ }
+ return retval;
+}
+
+static void
+put_border (const struct table *table, const struct table_cell *cell,
+ struct css_style *style,
+ enum table_axis axis, int h, int v,
+ const char *border_name)
+{
+ struct cell_color color;
+ const char *css = border_to_css (
+ table_get_rule (table, axis, cell->d[H][h], cell->d[V][v], &color));
+ if (css)
+ {
+ next_style (style);
+ fprintf (style->file, "border-%s: %s", border_name, css);
+
+ char buf[32];
+ if (format_color (color, (struct cell_color) CELL_COLOR_BLACK,
+ buf, sizeof buf))
+ fprintf (style->file, " %s", buf);
+ }
+}
+
+static void
+html_put_table_cell (struct html_driver *html, const struct pivot_table *pt,
+ const struct table_cell *cell,
+ const char *tag, const struct table *t)
+{
+ fprintf (html->file, "<%s", tag);
+
+ struct css_style style;
+ style_start (&style, html->file);
+
+ struct string body = DS_EMPTY_INITIALIZER;
+ bool numeric = pivot_value_format_body (cell->value, pt, &body);
+
+ enum table_halign halign = table_halign_interpret (cell->cell_style->halign,
+ numeric);
+
+ switch (halign)
+ {
+ case TABLE_HALIGN_RIGHT:
+ put_style (&style, "text-align", "right");
+ break;
+ case TABLE_HALIGN_CENTER:
+ put_style (&style, "text-align", "center");
+ break;
+ default:
+ /* Do nothing */
+ break;
+ }
+
+ if (cell->options & TAB_ROTATE)
+ put_style (&style, "writing-mode", "sideways-lr");
+
+ if (cell->cell_style->valign != TABLE_VALIGN_TOP)
+ {
+ put_style (&style, "vertical-align",
+ (cell->cell_style->valign == TABLE_VALIGN_BOTTOM
+ ? "bottom" : "middle"));
+ }
+
+ const struct font_style *fs = cell->font_style;
+ char bgcolor[32];
+ if (format_color (fs->bg[cell->d[V][0] % 2],
+ (struct cell_color) CELL_COLOR_WHITE,
+ bgcolor, sizeof bgcolor))
+ put_style (&style, "background", bgcolor);
+
+ char fgcolor[32];
+ if (format_color (fs->fg[cell->d[V][0] % 2],
+ (struct cell_color) CELL_COLOR_BLACK,
+ fgcolor, sizeof fgcolor))
+ put_style (&style, "color", fgcolor);
+
+ if (fs->typeface)
+ {
+ put_style (&style, "font-family", "\"");
+ escape_string (html->file, fs->typeface, " ", "\n");
+ putc ('"', html->file);
+ }
+ if (fs->bold)
+ put_style (&style, "font-weight", "bold");
+ if (fs->italic)
+ put_style (&style, "font-style", "italic");
+ if (fs->underline)
+ put_style (&style, "text-decoration", "underline");
+ if (fs->size)
+ {
+ char buf[32];
+ snprintf (buf, sizeof buf, "%dpt", fs->size);
+ put_style (&style, "font-size", buf);
+ }
+
+ if (t && html->borders)
{
- if (opts & TAB_EMPH)
- fputs ("<EM>", x->file);
- if (opts & TAB_FIX)
+ put_border (t, cell, &style, V, 0, 0, "top");
+ put_border (t, cell, &style, H, 0, 0, "left");
+
+ if (cell->d[V][1] == t->n[V])
+ put_border (t, cell, &style, V, 0, 1, "bottom");
+ if (cell->d[H][1] == t->n[H])
+ put_border (t, cell, &style, H, 1, 0, "right");
+ }
+ style_end (&style);
+
+ int colspan = table_cell_colspan (cell);
+ if (colspan > 1)
+ fprintf (html->file, " colspan=\"%d\"", colspan);
+
+ int rowspan = table_cell_rowspan (cell);
+ if (rowspan > 1)
+ fprintf (html->file, " rowspan=\"%d\"", rowspan);
+
+ putc ('>', html->file);
+
+ const char *s = ds_cstr (&body);
+ s += strspn (s, CC_SPACES);
+ escape_string (html->file, s, " ", "<br>");
+ ds_destroy (&body);
+
+ const struct pivot_value_ex *ex = pivot_value_ex (cell->value);
+ if (ex->n_subscripts)
+ {
+ fputs ("<sub>", html->file);
+ for (size_t i = 0; i < ex->n_subscripts; i++)
{
- fputs ("<TT>", x->file);
- escape_string (x->file, ss_data (text), ss_length (text), " ");
- fputs ("</TT>", x->file);
+ if (i)
+ putc (',', html->file);
+ escape_string (html->file, ex->subscripts[i], " ", "<br>");
}
- else
+ fputs ("</sub>", html->file);
+ }
+ if (ex->n_footnotes > 0)
+ {
+ fputs ("<sup>", html->file);
+ size_t n_footnotes = 0;
+ for (size_t i = 0; i < ex->n_footnotes; i++)
{
- 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,
- " ");
+ const struct pivot_footnote *f
+ = pt->footnotes[ex->footnote_indexes[i]];
+ if (f->show)
+ {
+ if (n_footnotes++ > 0)
+ putc (',', html->file);
+
+ char *marker = pivot_footnote_marker_string (f, pt);
+ escape_string (html->file, marker, " ", "<br>");
+ free (marker);
+ }
}
- if (opts & TAB_EMPH)
- fputs ("</EM>", x->file);
+ fputs ("</sup>", html->file);
}
+
+ /* output </th> or </td>. */
+ fprintf (html->file, "</%s>\n", tag);
}
-/* Write table T to THIS output driver. */
static void
-output_tab_table (struct outp_driver *this, struct tab_table *t)
+html_output_table_layer (struct html_driver *html, const struct pivot_table *pt,
+ const size_t *layer_indexes)
{
- struct html_driver_ext *x = this->ext;
+ struct table *title, *layers, *body, *caption, *footnotes;
+ pivot_output (pt, layer_indexes, true, &title, &layers, &body,
+ &caption, &footnotes, NULL, NULL);
- if (t->nr == 1 && t->nc == 1)
+ fputs ("<table", html->file);
+ if (pt->notes)
{
- fputs ("<P>", x->file);
- html_put_cell_contents (this, t->ct[0], *t->cc);
- fputs ("</P>\n", x->file);
+ fputs (" title=\"", html->file);
+ escape_string (html->file, pt->notes, " ", "\n");
+ putc ('"', html->file);
+ }
+ fputs (">\n", html->file);
- return;
+ if (title)
+ {
+ struct table_cell cell;
+ table_get_cell (title, 0, 0, &cell);
+ html_put_table_cell (html, pt, &cell, "caption", NULL);
}
- fputs ("<TABLE BORDER=1>\n", x->file);
+ if (layers)
+ {
+ fputs ("<thead>\n", html->file);
+ for (size_t y = 0; y < layers->n[V]; y++)
+ {
+ fputs ("<tr>\n", html->file);
+
+ struct table_cell cell;
+ table_get_cell (layers, 0, y, &cell);
+ cell.d[H][1] = body->n[H];
+ html_put_table_cell (html, pt, &cell, "td", NULL);
+
+ fputs ("</tr>\n", html->file);
+ }
+ fputs ("</thead>\n", html->file);
+ }
- if (t->title != NULL)
+ fputs ("<tbody>\n", html->file);
+ for (int y = 0; y < body->n[V]; y++)
{
- fprintf (x->file, " <CAPTION>");
- escape_string (x->file, t->title, strlen (t->title), " ");
- fputs ("</CAPTION>\n", x->file);
+ fputs ("<tr>\n", html->file);
+ for (int x = 0; x < body->n[H]; )
+ {
+ struct table_cell cell;
+ table_get_cell (body, x, y, &cell);
+ if (x == cell.d[TABLE_HORZ][0] && y == cell.d[TABLE_VERT][0])
+ {
+ bool is_header = (y < body->h[V][0]
+ || y >= body->n[V] - body->h[V][1]
+ || x < body->h[H][0]
+ || x >= body->n[H] - body->h[H][1]);
+ const char *tag = is_header ? "th" : "td";
+ html_put_table_cell (html, pt, &cell, tag, body);
+ }
+
+ x = cell.d[TABLE_HORZ][1];
+ }
+ fputs ("</tr>\n", html->file);
}
+ fputs ("</tbody>\n", html->file);
- {
- int r;
- unsigned char *ct = t->ct;
+ if (caption || footnotes)
+ {
+ fprintf (html->file, "<tfoot>\n");
- 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);
- }
- }
+ if (caption)
+ {
+ fputs ("<tr>\n", html->file);
- fputs ("</TABLE>\n\n", x->file);
-}
+ struct table_cell cell;
+ table_get_cell (caption, 0, 0, &cell);
+ cell.d[H][1] = body->n[H];
+ html_put_table_cell (html, pt, &cell, "td", NULL);
+ fputs ("</tr>\n", html->file);
+ }
+ if (footnotes)
+ for (size_t y = 0; y < footnotes->n[V]; y++)
+ {
+ fputs ("<tr>\n", html->file);
-/* HTML driver class. */
-const struct outp_class html_class =
- {
- "html",
- 1,
+ struct table_cell cell;
+ table_get_cell (footnotes, 0, y, &cell);
+ cell.d[H][1] = body->n[H];
+ html_put_table_cell (html, pt, &cell, "td", NULL);
- html_open_driver,
- html_close_driver,
+ fputs ("</tr>\n", html->file);
+ }
+ fputs ("</tfoot>\n", html->file);
+ }
- NULL,
- NULL,
- NULL,
+ fputs ("</table>\n\n", html->file);
- html_output_chart,
+ table_unref (title);
+ table_unref (layers);
+ table_unref (body);
+ table_unref (caption);
+ table_unref (footnotes);
+}
- html_submit,
+static void
+html_output_table (struct html_driver *html, const struct output_item *item)
+{
+ size_t *layer_indexes;
+ PIVOT_OUTPUT_FOR_EACH_LAYER (layer_indexes, item->table, true)
+ html_output_table_layer (html, item->table, layer_indexes);
+}
- NULL,
- NULL,
- NULL,
+struct output_driver_factory html_driver_factory =
+ { "html", "pspp.html", html_create };
+
+static const struct output_driver_class html_driver_class =
+ {
+ .name = "html",
+ .destroy = html_destroy,
+ .submit = html_submit,
+ .handles_groups = true,
};
projects / pspp / blobdiff