X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=0546e5d3a2eb94612605d9af1e78e9cfb8098215;hb=8f7af0acaf8a9253242d89fcdb26e285841f7833;hp=64db78dc8ec0c88fb931e913e282c9caea1be060;hpb=61b107f4f5e3ee7a468c91bc7fa269e268c5bc84;p=pspp diff --git a/src/output/html.c b/src/output/html.c index 64db78dc8e..0546e5d3a2 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" @@ -58,10 +55,8 @@ 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; @@ -75,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, @@ -184,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); @@ -199,10 +193,8 @@ html_create (struct file_handle *fh, enum settings_output_devices device_type, fh_get_file_name (fh))); html->file = NULL; html->chart_cnt = 1; -#ifdef HAVE_CAIRO 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) { @@ -253,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, "\"chart:", - file_name, title ? title : _("No description")); - free (file_name); + char *file_name = xr_draw_png_chart (item->chart, + html->chart_file_name, + html->chart_cnt++, + &html->fg, &html->bg); + if (file_name != NULL) + { + const char *title = chart_get_title (item->chart); + fprintf (html->file, "\"chart:", + 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->chart_cnt); + 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, "

\n"); + break; + + case OUTPUT_ITEM_PAGE_BREAK: + break; - case TEXT_ITEM_TITLE: + case OUTPUT_ITEM_TABLE: + html_output_table (html, item); + break; + + case OUTPUT_ITEM_TEXT: + { + char *s = text_item_get_plain_text (item); + + switch (item->text.subtype) { - int level = MIN (5, output_get_group_level ()) + 1; - char tag[3] = { 'H', level + '1', '\0' }; - print_title_tag (html->file, tag, s); - } - break; + case TEXT_ITEM_PAGE_TITLE: + break; - case TEXT_ITEM_SYNTAX: - fprintf (html->file, "
");
-          escape_string (html->file, s, " ", "
");
-          fprintf (html->file, "
\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, "
");
+            escape_string (html->file, s, " ", "
");
+            fprintf (html->file, "
\n"); + break; + + case TEXT_ITEM_LOG: + fprintf (html->file, "

"); + escape_string (html->file, s, " ", "
"); + fprintf (html->file, "

\n"); + break; + } - case TEXT_ITEM_LOG: - print_title_tag (html->file, "pre", s); /* should be

*/ - 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. */ @@ -360,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, "", tag); -} - static const char * border_to_css (int border) { @@ -424,10 +436,17 @@ style_end (struct css_style *cs) } static void -put_style (struct css_style *st, const char *name, const char *value) +next_style (struct css_style *st) { bool first = !st->n_styles++; - fprintf (st->file, "%s%s: %s", first ? " style='" : "; ", name, value); + 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 @@ -448,296 +467,272 @@ format_color (const struct cell_color color, } static void -put_border (struct css_style *st, int style, const struct cell_color *color, +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) { - const char *css = border_to_css (style); + 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) { - if (st->n_styles++ > 0) - fputs ("; ", st->file); - fprintf (st->file, "border-%s: %s", border_name, 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, + if (format_color (color, (struct cell_color) CELL_COLOR_BLACK, buf, sizeof buf)) - fprintf (st->file, " %s", buf); + fprintf (style->file, " %s", buf); } } static void -put_tfoot (struct html_driver *html, const struct table *t, bool *tfoot) +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 (!*tfoot) + 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 ("\n", html->file); - fputs ("\n", html->file); - fprintf (html->file, "\n", t->n[H]); - *tfoot = true; + 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; } - else - fputs ("\n
", html->file); -} -static void -html_put_footnote_markers (struct html_driver *html, - const struct footnote **footnotes, - size_t n_footnotes) -{ - if (n_footnotes > 0) - { - fputs ("", html->file); - for (size_t i = 0; i < n_footnotes; i++) - { - const struct footnote *f = footnotes[i]; + if (cell->options & TAB_ROTATE) + put_style (&style, "writing-mode", "sideways-lr"); - if (i > 0) - putc (',', html->file); - escape_string (html->file, f->marker, " ", "
"); - } - fputs ("", html->file); + if (cell->cell_style->valign != TABLE_VALIGN_TOP) + { + put_style (&style, "vertical-align", + (cell->cell_style->valign == TABLE_VALIGN_BOTTOM + ? "bottom" : "middle")); } -} -static void -html_put_table_item_text (struct html_driver *html, - const struct table_item_text *text) -{ - escape_string (html->file, text->content, " ", "
"); - html_put_footnote_markers (html, text->footnotes, text->n_footnotes); -} + 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); -static void -html_put_table_cell_text (struct html_driver *html, - const struct table_cell *cell) -{ - const char *s = cell->text; - if (cell->options & TAB_FIX) - escape_tag (html->file, "tt", s, " ", "
"); - else + 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) { - s += strspn (s, CC_SPACES); - escape_string (html->file, s, " ", "
"); + 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 (cell->n_subscripts) + 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 < cell->n_subscripts; i++) + for (size_t i = 0; i < ex->n_subscripts; i++) { if (i) putc (',', html->file); - escape_string (html->file, cell->subscripts[i], - " ", "
"); + escape_string (html->file, ex->subscripts[i], " ", "
"); } fputs ("", html->file); } - html_put_footnote_markers (html, cell->footnotes, cell->n_footnotes); -} - -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 (ex->n_footnotes > 0) { - if (i) - fputs ("
\n", html->file); + 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); - 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); + char *marker = pivot_footnote_marker_string (f, pt); + escape_string (html->file, marker, " ", "
"); + free (marker); + } + } + fputs ("", html->file); } + + /* output or . */ + fprintf (html->file, "\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 ("file); - if (item->notes) + if (pt->notes) { fputs (" title=\"", html->file); - escape_string (html->file, item->notes, " ", "\n"); + escape_string (html->file, pt->notes, " ", "\n"); putc ('"', html->file); } fputs (">\n", html->file); - const struct table_item_text *caption = table_item_get_caption (item); - if (caption) + if (title) { - put_tfoot (html, t, &tfoot); - html_put_table_item_text (html, caption); + struct table_cell cell; + table_get_cell (title, 0, 0, &cell); + html_put_table_cell (html, pt, &cell, "caption", NULL); } - const struct footnote **f; - size_t n_footnotes = table_collect_footnotes (item, &f); - for (size_t i = 0; i < n_footnotes; i++) + if (layers) { - put_tfoot (html, t, &tfoot); - escape_tag (html->file, "sup", f[i]->marker, " ", "
"); - escape_string (html->file, f[i]->content, " ", "
"); - } - free (f); - if (tfoot) - { - fputs ("\n", html->file); - fputs ("\n", html->file); - fputs ("\n", html->file); - } + fputs ("\n", html->file); + for (size_t y = 0; y < layers->n[V]; y++) + { + fputs ("\n", html->file); - 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 ("", html->file); - if (title) - html_put_table_item_text (html, title); - if (title && layers) - fputs ("
\n", html->file); - if (layers) - html_put_table_item_layers (html, layers); - fputs ("\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 ("\n", html->file); + } + fputs ("\n", html->file); } fputs ("\n", html->file); - - for (y = 0; y < t->n[V]; y++) + for (int y = 0; y < body->n[V]; y++) { - int x; - fputs ("\n", html->file); - for (x = 0; x < t->n[H];) + for (int x = 0; x < body->n[H]; ) { struct table_cell cell; - const char *tag; - - table_get_cell (t, x, y, &cell); - if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0]) - goto next_1; - - /* output or tag. */ - bool is_header = (y < t->h[V][0] - || y >= t->n[V] - t->h[V][1] - || x < t->h[H][0] - || x >= t->n[H] - t->h[H][1]); - tag = is_header ? "th" : "td"; - fprintf (html->file, "<%s", tag); - - struct css_style style; - style_start (&style, html->file); - enum table_halign halign = table_halign_interpret ( - cell.style->cell_style.halign, cell.options & TAB_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.style->cell_style.valign != TABLE_VALIGN_TOP) - { - put_style (&style, "vertical-align", - (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM - ? "bottom" : "middle")); - } - - const struct font_style *fs = &cell.style->font_style; - char bgcolor[32]; - if (format_color (fs->bg[y % 2], - (struct cell_color) CELL_COLOR_WHITE, - bgcolor, sizeof bgcolor)) - put_style (&style, "background", bgcolor); - - char fgcolor[32]; - if (format_color (fs->fg[y % 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) + table_get_cell (body, x, y, &cell); + if (x == cell.d[TABLE_HORZ][0] && y == cell.d[TABLE_VERT][0]) { - char buf[32]; - snprintf (buf, sizeof buf, "%dpt", fs->size); - put_style (&style, "font-size", buf); + 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); } - 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, &color, "top"); - - if (y + rowspan == t->n[V]) - { - int bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan, - &color); - put_border (&style, bottom, &color, "bottom"); - } - - int left = table_get_rule (t, TABLE_HORZ, x, y, &color); - put_border (&style, left, &color, "left"); + x = cell.d[TABLE_HORZ][1]; + } + fputs ("\n", html->file); + } + fputs ("\n", html->file); - if (x + colspan == t->n[H]) - { - int right = table_get_rule (t, TABLE_HORZ, x + colspan, y, - &color); - put_border (&style, right, &color, "right"); - } - } - style_end (&style); + if (caption || footnotes) + { + fprintf (html->file, "\n"); - if (colspan > 1) - fprintf (html->file, " colspan=\"%d\"", colspan); + if (caption) + { + fputs ("\n", html->file); - if (rowspan > 1) - fprintf (html->file, " rowspan=\"%d\"", rowspan); + 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); - putc ('>', html->file); + fputs ("\n", html->file); + } - html_put_table_cell_text (html, &cell); + if (footnotes) + for (size_t y = 0; y < footnotes->n[V]; y++) + { + fputs ("\n", html->file); - /* output or . */ - fprintf (html->file, "\n", tag); + 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); - next_1: - x = cell.d[TABLE_HORZ][1]; - } - fputs ("\n", html->file); + fputs ("\n", html->file); + } + fputs ("\n", html->file); } - fputs ("\n", html->file); fputs ("\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 = @@ -745,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, };