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=85defc9ab2d55aa7b2fca9d1f6c30d8b1d37d3fc;hpb=a06dd54ab3d37656a1edfb8ee7de859cc0baac0e;p=pspp diff --git a/src/output/html.c b/src/output/html.c index 85defc9ab2..a2e63f9438 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -33,15 +33,14 @@ #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 "gl/minmax.h" #include "gl/xalloc.h" @@ -49,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; @@ -69,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, @@ -152,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" @@ -179,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); @@ -193,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) { @@ -248,78 +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 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; + case OUTPUT_ITEM_MESSAGE: + fprintf (html->file, "
"); - case TEXT_ITEM_SYNTAX: - fprintf (html->file, "
"); - escape_string (html->file, s, " ", "\n"); - break; + char *s = msg_to_string (item->message); + escape_string (html->file, s, " ", "
"); - fprintf (html->file, "
*/ - break; + fprintf (html->file, "
\n"); + break; - case TEXT_ITEM_EJECT_PAGE: - /* Nothing to do. */ - 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); + case OUTPUT_ITEM_PAGE_BREAK: + break; + + 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) + { + 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, ""); + 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, "
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 ("
---|