X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=9e7f567a27274866efda6d67fddef2ca74082d3c;hb=2a45a48f87553563cbf0f0b6dcc20396b3e5a27a;hp=3e85b3d968b69c76653775a7239f10c9e08869e3;hpb=d1d0556e538bf04cb0b991b7acb205c144a2f826;p=pspp diff --git a/src/output/html.c b/src/output/html.c index 3e85b3d968..9e7f567a27 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -64,8 +64,7 @@ struct html_driver static const struct output_driver_class html_driver_class; -static void html_output_table (struct html_driver *, const struct table *, - const char *caption); +static void html_output_table (struct html_driver *, const struct table_item *); static void escape_string (FILE *file, const char *text, size_t length, const char *space, const char *newline); @@ -236,8 +235,7 @@ html_submit (struct output_driver *driver, if (is_table_item (output_item)) { struct table_item *table_item = to_table_item (output_item); - html_output_table (html, table_item_get_table (table_item), - table_item_get_caption (table_item)); + html_output_table (html, table_item); } #ifdef HAVE_CAIRO else if (is_chart_item (output_item) && html->chart_file_name != NULL) @@ -376,24 +374,86 @@ put_border (FILE *file, int n_borders, int style, const char *border_name) } static void -html_output_table (struct html_driver *html, - const struct table *t, const char *caption) +put_tfoot (struct html_driver *html, const struct table *t, bool *tfoot) { - int x, y; + if (!*tfoot) + { + fprintf (html->file, "