X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=a2e63f943888169a1e30458f6b7d0b100bc6e102;hb=refs%2Fheads%2Fctables7;hp=b8679b57eca1ce7b41968dde01cf9b2404ecfe71;hpb=940995f8639c5c95bd3067b7e934160dfd52d709;p=pspp diff --git a/src/output/html.c b/src/output/html.c index b8679b57ec..a2e63f9438 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -33,17 +33,14 @@ #include "libpspp/i18n.h" #include "libpspp/message.h" #include "libpspp/version.h" -#ifdef HAVE_CAIRO #include "output/cairo-chart.h" -#endif -#include "output/chart-item.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 "gl/minmax.h" #include "gl/xalloc.h" @@ -51,18 +48,20 @@ #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 cell_color fg; struct cell_color bg; -#endif struct file_handle *handle; char *chart_file_name; FILE *file; - size_t chart_cnt; + size_t n_charts; bool bare; bool css; @@ -71,7 +70,8 @@ struct html_driver static const struct output_driver_class html_driver_class; -static void html_output_table (struct html_driver *, const struct table_item *); +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, @@ -154,11 +154,10 @@ put_header (struct html_driver *html) " 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" @@ -181,9 +180,7 @@ 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); + 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); @@ -195,11 +192,9 @@ html_create (struct file_handle *fh, enum settings_output_devices device_type, 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 + html->n_charts = 1; html->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF")); html->fg = parse_color (opt (d, o, "foreground-color", "#000000000000")); -#endif html->file = fn_open (html->handle, "w"); if (html->file == NULL) { @@ -250,74 +245,106 @@ html_destroy (struct output_driver *driver) } 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)) - { - 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) + switch (item->type) { - 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, "", - 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, "", + 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 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 OUTPUT_ITEM_IMAGE: + if (html->chart_file_name) { - case TEXT_ITEM_PAGE_TITLE: - break; + char *file_name = xr_write_png_image ( + item->image, html->chart_file_name, ++html->n_charts); + if (file_name != NULL) + { + fprintf (html->file, "", file_name); + free (file_name); + } + } + break; + + case OUTPUT_ITEM_MESSAGE: + fprintf (html->file, "
");
+
+ char *s = msg_to_string (item->message);
+ escape_string (html->file, s, " ", "
");
+ free (s);
+
+ fprintf (html->file, "
"); - escape_string (html->file, s, " ", "\n"); - 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, "
"); - fprintf (html->file, "
"); + escape_string (html->file, s, " ", "\n"); + break; + + case TEXT_ITEM_LOG: + fprintf (html->file, "
"); + fprintf (html->file, "
");
+ escape_string (html->file, s, " ", "
");
+ fprintf (html->file, "
*/
- break;
- }
- }
- else if (is_message_item (output_item))
- {
- 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);
+ free (s);
+ }
+ break;
}
}
+static void
+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 "
" or "\n" or something else appropriate. */
@@ -357,18 +384,6 @@ escape_string (FILE *file, const char *text,
}
}
-static void
-escape_tag (FILE *file, const char *tag,
- const char *text, const char *space, const char *newline)
-{
- if (!text || !*text)
- return;
-
- fprintf (file, "<%s>", tag);
- escape_string (file, text, space, newline);
- fprintf (file, "%s>", tag);
-}
-
static const char *
border_to_css (int border)
{
@@ -404,269 +419,320 @@ struct css_style
int n_styles;
};
-static struct css_style *
-style_start (FILE *file)
+static void
+style_start (struct css_style *cs, FILE *file)
{
- struct css_style *cs = XMALLOC (struct css_style);
- cs->file = file;
- cs->n_styles = 0;
- fputs (" style=\"", file);
- return cs;
+ *cs = (struct css_style) {
+ .file = file,
+ .n_styles = 0,
+ };
}
static void
style_end (struct css_style *cs)
{
- fputs ("\"", cs->file);
- free (cs);
+ if (cs->n_styles > 0)
+ fputs ("'", cs->file);
}
static void
-put_style (struct css_style *st, const char *name, const char *value)
+next_style (struct css_style *st)
{
- if (st->n_styles++ > 0)
- fputs ("; ", st->file);
- fprintf (st->file, "%s: %s", name, value);
+ bool first = !st->n_styles++;
+ fputs (first ? " style='" : "; ", st->file);
}
static void
-put_border (struct css_style *st, int style, const char *border_name)
+put_style (struct css_style *st, const char *name, const char *value)
{
- const char *css = border_to_css (style);
- if (css)
- {
- if (st->n_styles++ > 0)
- fputs ("; ", st->file);
- fprintf (st->file, "border-%s: %s", border_name, css);
- }
+ next_style (st);
+ fprintf (st->file, "%s: %s", name, value);
}
-static void
-put_tfoot (struct html_driver *html, const struct table *t, bool *tfoot)
+static bool
+format_color (const struct cell_color color,
+ const struct cell_color default_color,
+ char *buf, size_t bufsize)
{
- if (!*tfoot)
+ bool retval = !cell_color_equal (&color, &default_color);
+ if (retval)
{
- fputs ("\n", html->file);
- fputs ("\n", html->file);
- fprintf (html->file, " \n", table_nc (t));
- *tfoot = true;
+ 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);
}
- else
- fputs ("\n
", html->file);
+ return retval;
}
static void
-html_put_footnote_markers (struct html_driver *html,
- const struct footnote **footnotes,
- size_t n_footnotes)
+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 (n_footnotes > 0)
+ 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)
{
- fputs ("", html->file);
- for (size_t i = 0; i < n_footnotes; i++)
- {
- const struct footnote *f = footnotes[i];
+ next_style (style);
+ fprintf (style->file, "border-%s: %s", border_name, css);
- if (i > 0)
- putc (',', html->file);
- escape_string (html->file, f->marker, " ", "
");
- }
- fputs ("", html->file);
+ 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_item_text (struct html_driver *html,
- const struct table_item_text *text)
+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)
{
- escape_string (html->file, text->content, " ", "
");
- html_put_footnote_markers (html, text->footnotes, text->n_footnotes);
-}
+ fprintf (html->file, "<%s", tag);
-static void
-html_put_table_item_layers (struct html_driver *html,
- const struct table_item_layers *layers)
-{
- for (size_t i = 0; i < layers->n_layers; i++)
- {
- if (i)
- fputs ("
\n", html->file);
+ struct css_style style;
+ style_start (&style, html->file);
- const struct table_item_layer *layer = &layers->layers[i];
- escape_string (html->file, layer->content, " ", "
");
- html_put_footnote_markers (html, layer->footnotes, layer->n_footnotes);
- }
-}
+ struct string body = DS_EMPTY_INITIALIZER;
+ bool numeric = pivot_value_format_body (cell->value, pt, &body);
-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;
+ 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;
+ }
- fputs ("\n", html->file);
+ if (cell->options & TAB_ROTATE)
+ put_style (&style, "writing-mode", "sideways-lr");
- const struct table_item_text *caption = table_item_get_caption (item);
- if (caption)
+ if (cell->cell_style->valign != TABLE_VALIGN_TOP)
{
- put_tfoot (html, t, &tfoot);
- html_put_table_item_text (html, caption);
+ put_style (&style, "vertical-align",
+ (cell->cell_style->valign == TABLE_VALIGN_BOTTOM
+ ? "bottom" : "middle"));
}
- const struct footnote **f;
- size_t n_footnotes = table_collect_footnotes (item, &f);
- for (size_t i = 0; i < n_footnotes; i++)
+ 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_tfoot (html, t, &tfoot);
- escape_tag (html->file, "sup", f[i]->marker, " ", "
");
- escape_string (html->file, f[i]->content, " ", "
");
+ put_style (&style, "font-family", "\"");
+ escape_string (html->file, fs->typeface, " ", "\n");
+ putc ('"', html->file);
}
- free (f);
- if (tfoot)
+ 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)
{
- fputs ("\n", html->file);
- fputs ("\n", html->file);
- fputs ("\n", html->file);
+ char buf[32];
+ snprintf (buf, sizeof buf, "%dpt", fs->size);
+ put_style (&style, "font-size", buf);
}
- 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)
+ if (t && html->borders)
{
- fputs ("
\n", html->file);
- if (layers)
- html_put_table_item_layers (html, layers);
- fputs ("\n", html->file);
- for (x = 0; x < table_nc (t);)
+ putc ('>', html->file);
+
+ const char *s = ds_cstr (&body);
+ s += strspn (s, CC_SPACES);
+ escape_string (html->file, s, " ", "
");
+ ds_destroy (&body);
+
+ const struct pivot_value_ex *ex = pivot_value_ex (cell->value);
+ if (ex->n_subscripts)
+ {
+ fputs ("", html->file);
+ for (size_t i = 0; i < ex->n_subscripts; i++)
{
- struct table_cell cell;
- const char *tag;
+ if (i)
+ putc (',', html->file);
+ escape_string (html->file, ex->subscripts[i], " ", "
");
+ }
+ fputs ("", html->file);
+ }
+ if (ex->n_footnotes > 0)
+ {
+ fputs ("", 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);
- table_get_cell (t, x, y, &cell);
- if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0])
- goto next_1;
+ char *marker = pivot_footnote_marker_string (f, pt);
+ escape_string (html->file, marker, " ", "
");
+ free (marker);
+ }
+ }
+ fputs ("", html->file);
+ }
- /* output or tag. */
- bool 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);
+ /* output or . */
+ fprintf (html->file, "%s>\n", tag);
+}
- struct css_style *style = style_start (html->file);
- enum table_halign halign = table_halign_interpret (
- cell.style->cell_style.halign, cell.options & TAB_NUMERIC);
+static void
+html_output_table_layer (struct html_driver *html, const struct pivot_table *pt,
+ const size_t *layer_indexes)
+{
+ struct table *title, *layers, *body, *caption, *footnotes;
+ pivot_output (pt, layer_indexes, true, &title, &layers, &body,
+ &caption, &footnotes, NULL, NULL);
- 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;
- }
+ fputs ("file);
+ if (pt->notes)
+ {
+ fputs (" title=\"", html->file);
+ escape_string (html->file, pt->notes, " ", "\n");
+ putc ('"', html->file);
+ }
+ fputs (">\n", html->file);
- if (cell.style->cell_style.valign != TABLE_VALIGN_TOP)
- {
- put_style (style, "vertical-align",
- (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM
- ? "bottom" : "middle"));
- }
+ if (title)
+ {
+ struct table_cell cell;
+ table_get_cell (title, 0, 0, &cell);
+ html_put_table_cell (html, pt, &cell, "caption", NULL);
+ }
- int colspan = table_cell_colspan (&cell);
- int rowspan = table_cell_rowspan (&cell);
-
- if (html->borders)
- {
- /* Cell borders. */
- struct cell_color color;
-
- int top = table_get_rule (t, TABLE_VERT, x, y, &color);
- put_border (style, top, "top");
-
- if (y + rowspan == table_nr (t))
- {
- int bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan,
- &color);
- put_border (style, bottom, "bottom");
- }
-
- int left = table_get_rule (t, TABLE_HORZ, x, y, &color);
- put_border (style, left, "left");
-
- if (x + colspan == table_nc (t))
- {
- int right = table_get_rule (t, TABLE_HORZ, x + colspan, y,
- &color);
- put_border (style, right, "right");
- }
- }
- style_end (style);
-
- if (colspan > 1)
- fprintf (html->file, " colspan=\"%d\"", colspan);
-
- if (rowspan > 1)
- fprintf (html->file, " rowspan=\"%d\"", rowspan);
-
- putc ('>', html->file);
-
- /* Output cell contents. */
- const char *s = cell.text;
- if (cell.options & TAB_FIX)
- escape_tag (html->file, "tt", s, " ", "
\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 =
@@ -674,8 +740,8 @@ 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,
};
");
- else
- {
- s += strspn (s, CC_SPACES);
- escape_string (html->file, s, " ", "
");
- }
+ if (layers)
+ {
+ fputs ("\n", html->file);
+ for (size_t y = 0; y < layers->n[V]; y++)
+ {
+ fputs ("\n", html->file);
- if (cell.n_subscripts)
+ 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 (" \n", html->file);
+ }
+ fputs ("\n", html->file);
+ }
+
+ fputs ("\n", html->file);
+ for (int y = 0; y < body->n[V]; y++)
+ {
+ fputs ("\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])
{
- fputs ("", html->file);
- for (size_t i = 0; i < cell.n_subscripts; i++)
- {
- if (i)
- putc (',', html->file);
- escape_string (html->file, cell.subscripts[i],
- " ", " \n", html->file);
}
-
fputs ("\n", html->file);
+
+ if (caption || footnotes)
+ {
+ fprintf (html->file, "\n");
+
+ if (caption)
+ {
+ fputs ("
");
- }
- fputs ("", html->file);
+ 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);
}
- if (cell.superscript)
- escape_tag (html->file, "sup", cell.superscript, " ", "
");
- html_put_footnote_markers (html, cell.footnotes, cell.n_footnotes);
- /* output or . */
- fprintf (html->file, "%s>\n", tag);
-
- next_1:
x = cell.d[TABLE_HORZ][1];
}
fputs ("\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 (" \n", html->file);
+ }
+
+ if (footnotes)
+ for (size_t y = 0; y < footnotes->n[V]; y++)
+ {
+ fputs ("\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 (" \n", html->file);
+ }
+ fputs ("\n", html->file);
+ }
+
fputs ("