/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2017 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
#include <ctype.h>
#include <time.h>
#include <unistd.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.h"
-#include "output/chart-item.h"
+#include "output/cairo-chart.h"
+#include "output/chart.h"
#include "output/driver-provider.h"
-#include "output/message-item.h"
#include "output/options.h"
-#include "output/output-item-provider.h"
+#include "output/output-item.h"
+#include "output/pivot-output.h"
+#include "output/pivot-table.h"
#include "output/table-provider.h"
-#include "output/table-item.h"
-#include "output/text-item.h"
-#include "xalloc.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
+/* 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;
-#ifdef HAVE_CAIRO
- struct xr_color fg;
- struct xr_color bg;
-#endif
+ struct cell_color fg;
+ struct cell_color bg;
struct file_handle *handle;
char *chart_file_name;
FILE *file;
- size_t chart_cnt;
+ size_t n_charts;
+ bool bare;
bool css;
bool borders;
};
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,
+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);
return driver_option_get (d, options, key, default_value);
}
-static struct output_driver *
-html_create (struct file_handle *fh, enum settings_output_devices device_type,
- struct string_map *o)
+static void
+put_header (struct html_driver *html)
{
- 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)
+ 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)
{
- 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", 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=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"
+ fputs ("<style>\n"
"<!--\n"
"body {\n"
" background: white;\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"
+ "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",
+ "</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);
+ fputs ("</head>\n", html->file);
+ fputs ("<body>\n", html->file);
+}
+
+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)
+ {
+ msg_error (errno, _("error opening output file `%s'"), fh_get_file_name (html->handle));
+ goto error;
+ }
+
+ if (!html->bare)
+ put_header (html);
return d;
{
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);
}
}
if (html->file != NULL)
{
- fprintf (html->file,
- "</BODY>\n"
- "</HTML>\n"
- "<!-- end of file -->\n");
+ if (!html->bare)
+ fprintf (html->file,
+ "</body>\n"
+ "</html>\n"
+ "<!-- end of file -->\n");
fn_close (html->handle, html->file);
}
free (html->chart_file_name);
}
static void
-html_submit (struct output_driver *driver,
- const struct output_item *output_item)
+html_submit__ (struct output_driver *driver, const struct output_item *item,
+ int level)
{
struct html_driver *html = html_driver_cast (driver);
- if (is_table_item (output_item))
+ switch (item->type)
{
- 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 OUTPUT_ITEM_CHART:
+ if (html->chart_file_name)
{
- 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);
+ 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);
+ }
}
- }
-#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);
+ break;
- switch (text_item_get_type (text_item))
- {
- case TEXT_ITEM_TITLE:
- print_title_tag (html->file, "H1", s);
- 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 TEXT_ITEM_SUBTITLE:
- print_title_tag (html->file, "H2", s);
- break;
-
- case TEXT_ITEM_COMMAND_OPEN:
- fprintf (html->file, "<DIV class=\"");
- escape_string (html->file, s, strlen (s), "_", "<BR>");
- fprintf (html->file, "\">");
- print_title_tag (html->file, "H3", s);
- break;
+ case OUTPUT_ITEM_IMAGE:
+ if (html->chart_file_name)
+ {
+ char *file_name = xr_write_png_image (
+ item->image, html->chart_file_name, ++html->n_charts);
+ if (file_name != NULL)
+ {
+ fprintf (html->file, "<img src=\"%s\">", file_name);
+ free (file_name);
+ }
+ }
+ break;
- case TEXT_ITEM_COMMAND_CLOSE:
- fprintf (html->file, "</DIV>\n");
- break;
+ case OUTPUT_ITEM_MESSAGE:
+ fprintf (html->file, "<p>");
- case TEXT_ITEM_SUBHEAD:
- print_title_tag (html->file, "H4", s);
- break;
+ char *s = msg_to_string (item->message);
+ escape_string (html->file, s, " ", "<br>");
+ free (s);
- case TEXT_ITEM_SYNTAX:
- fprintf (html->file, "<PRE class=\"syntax\">");
- escape_string (html->file, s, strlen (s), " ", "<BR>");
- fprintf (html->file, "</PRE>\n");
- break;
+ fprintf (html->file, "</p>\n");
+ break;
- case TEXT_ITEM_PARAGRAPH:
- print_title_tag (html->file, "P", s);
- break;
+ case OUTPUT_ITEM_PAGE_BREAK:
+ break;
- case TEXT_ITEM_MONOSPACE:
- print_title_tag (html->file, "PRE", s); /* should be <P><TT> */
- break;
+ case OUTPUT_ITEM_TABLE:
+ html_output_table (html, item);
+ break;
- case TEXT_ITEM_BLANK_LINE:
- fputs ("<BR>", html->file);
- break;
+ case OUTPUT_ITEM_TEXT:
+ {
+ char *s = text_item_get_plain_text (item);
- case TEXT_ITEM_EJECT_PAGE:
- /* Nothing to do. */
- break;
+ switch (item->text.subtype)
+ {
+ case TEXT_ITEM_PAGE_TITLE:
+ break;
- case TEXT_ITEM_COMMENT:
- case TEXT_ITEM_ECHO:
- /* We print out syntax anyway, so nothing to do here either. */
- break;
- }
- }
- else if (is_message_item (output_item))
- {
- const struct message_item *message_item = to_message_item (output_item);
- const struct msg *msg = message_item_get_msg (message_item);
- char *s = msg_to_string (msg, message_item->command_name);
- print_title_tag (html->file, "P", s);
- free (s);
+ 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;
}
}
-/* 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,
+html_submit (struct output_driver *driver, const struct output_item *item)
+{
+ 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)
{
- while (length-- > 0)
+ for (;;)
{
char c = *text++;
switch (c)
{
+ case 0:
+ return;
case '\n':
fputs (newline, file);
break;
{
switch (border)
{
- case TAL_NONE:
+ case TABLE_STROKE_NONE:
return NULL;
- case TAL_SOLID:
+ case TABLE_STROKE_SOLID:
return "solid";
- case TAL_DASHED:
+ case TABLE_STROKE_DASHED:
return "dashed";
- case TAL_THICK:
+ case TABLE_STROKE_THICK:
return "thick solid";
- case TAL_THIN:
+ case TABLE_STROKE_THIN:
return "thin solid";
- case TAL_DOUBLE:
+ case TABLE_STROKE_DOUBLE:
return "double";
default:
}
+struct css_style
+{
+ FILE *file;
+ int n_styles;
+};
+
static void
-put_border (FILE *file, int *n_borders, int style, const char *border_name)
+style_start (struct css_style *cs, FILE *file)
{
- const char *css = border_to_css (style);
- if (css)
+ *cs = (struct css_style) {
+ .file = file,
+ .n_styles = 0,
+ };
+}
+
+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)
{
- fprintf (file, "%sborder-%s: %s",
- (*n_borders)++ == 0 ? " STYLE=\"" : "; ",
- border_name, css);
+ 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_tfoot (struct html_driver *html, const struct table *t, bool *tfoot)
+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)
{
- if (!*tfoot)
+ 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)
{
- fprintf (html->file, "<TFOOT><TR><TD COLSPAN=%d>", table_nc (t));
- *tfoot = true;
+ 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);
}
- else
- fputs ("\n<BR>", html->file);
}
static void
-html_put_footnote_markers (struct html_driver *html,
- const struct footnote **footnotes,
- size_t n_footnotes)
+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)
{
- if (n_footnotes > 0)
+ 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)
{
- fputs ("<SUP>", html->file);
- for (size_t i = 0; i < n_footnotes; i++)
- {
- const struct footnote *f = footnotes[i];
+ 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)
+ {
+ 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);
- if (i > 0)
+ 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++)
+ {
+ if (i)
putc (',', html->file);
- escape_string (html->file, f->marker,
- strlen (f->marker), " ", "<BR>");
+ escape_string (html->file, ex->subscripts[i], " ", "<br>");
}
- fputs ("</SUP>", html->file);
+ 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++)
+ {
+ const struct pivot_footnote *f
+ = pt->footnotes[ex->footnote_indexes[i]];
+ if (f->show)
+ {
+ if (n_footnotes++ > 0)
+ putc (',', html->file);
-static void
-html_put_table_item_text (struct html_driver *html,
- const struct table_item_text *text)
-{
- escape_string (html->file, text->content, strlen (text->content),
- " ", "<BR>");
- html_put_footnote_markers (html, text->footnotes, text->n_footnotes);
+ char *marker = pivot_footnote_marker_string (f, pt);
+ escape_string (html->file, marker, " ", "<br>");
+ free (marker);
+ }
+ }
+ fputs ("</sup>", html->file);
+ }
+
+ /* output </th> or </td>. */
+ fprintf (html->file, "</%s>\n", tag);
}
static void
-html_output_table (struct html_driver *html, const struct table_item *item)
+html_output_table_layer (struct html_driver *html, const struct pivot_table *pt,
+ const size_t *layer_indexes)
{
- const struct table *t = table_item_get_table (item);
- bool tfoot = false;
- int y;
+ struct table *title, *layers, *body, *caption, *footnotes;
+ pivot_output (pt, layer_indexes, true, &title, &layers, &body,
+ &caption, &footnotes, NULL, NULL);
- fputs ("<TABLE>", html->file);
-
- const struct table_item_text *caption = table_item_get_caption (item);
- if (caption)
+ fputs ("<table", html->file);
+ if (pt->notes)
{
- put_tfoot (html, t, &tfoot);
- html_put_table_item_text (html, caption);
+ fputs (" title=\"", html->file);
+ escape_string (html->file, pt->notes, " ", "\n");
+ putc ('"', html->file);
}
- const struct footnote **f;
- size_t n_footnotes = table_collect_footnotes (item, &f);
+ fputs (">\n", html->file);
- for (size_t i = 0; i < n_footnotes; i++)
- if (f[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);
-
- fputs ("<TBODY VALIGN=\"TOP\">\n", html->file);
-
- const struct table_item_text *title = table_item_get_title (item);
if (title)
{
- fputs (" <CAPTION>", html->file);
- html_put_table_item_text (html, title);
- fputs ("</CAPTION>\n", html->file);
+ struct table_cell cell;
+ table_get_cell (title, 0, 0, &cell);
+ html_put_table_cell (html, pt, &cell, "caption", NULL);
}
- for (y = 0; y < table_nr (t); y++)
+ if (layers)
{
- int x;
+ 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);
- for (x = 0; x < table_nc (t); )
+ fputs ("</tr>\n", html->file);
+ }
+ fputs ("</thead>\n", html->file);
+ }
+
+ fputs ("<tbody>\n", html->file);
+ for (int y = 0; y < body->n[V]; y++)
+ {
+ fputs ("<tr>\n", html->file);
+ for (int x = 0; x < body->n[H]; )
{
- const struct cell_contents *c;
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);
-
- int halign = (cell.n_contents > 0
- ? cell.contents[0].options & TAB_HALIGN
- : TAB_LEFT);
- if (halign != TAB_LEFT)
- fprintf (html->file, " ALIGN=\"%s\"",
- halign == TAB_RIGHT ? "RIGHT" : "CENTER");
-
- int valign = (cell.n_contents > 0
- ? cell.contents[0].options & TAB_VALIGN
- : TAB_LEFT);
- if (valign != TAB_TOP)
- fprintf (html->file, " ALIGN=\"%s\"",
- valign == TAB_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. */
- for (c = cell.contents; c < &cell.contents[cell.n_contents]; c++)
+ table_get_cell (body, x, y, &cell);
+ if (x == cell.d[TABLE_HORZ][0] && y == cell.d[TABLE_VERT][0])
{
- const char *s = c->text;
-
- if (c->options & TAB_EMPH)
- fputs ("<EM>", html->file);
- if (c->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>");
- }
- if (c->options & TAB_EMPH)
- fputs ("</EM>", html->file);
-
- html_put_footnote_markers (html, c->footnotes, c->n_footnotes);
+ 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);
}
- /* 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 ("</tr>\n", html->file);
+ }
+ fputs ("</tbody>\n", html->file);
+
+ if (caption || footnotes)
+ {
+ fprintf (html->file, "<tfoot>\n");
+
+ if (caption)
+ {
+ fputs ("<tr>\n", html->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);
+
+ 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);
+
+ fputs ("</tr>\n", html->file);
+ }
+ fputs ("</tfoot>\n", html->file);
}
- fputs ("</TBODY></TABLE>\n\n", html->file);
+ fputs ("</table>\n\n", html->file);
+
+ table_unref (title);
+ table_unref (layers);
+ table_unref (body);
+ table_unref (caption);
+ table_unref (footnotes);
+}
+
+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);
}
struct output_driver_factory html_driver_factory =
static const struct output_driver_class html_driver_class =
{
- "html",
- html_destroy,
- html_submit,
- NULL,
+ .name = "html",
+ .destroy = html_destroy,
+ .submit = html_submit,
+ .handles_groups = true,
};
projects / pspp / blobdiff