X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=9e7f567a27274866efda6d67fddef2ca74082d3c;hb=b779cc2fe07d6e8e66aad413e4644e8e124c65ff;hp=8d20a61b3796c8837412018c436f80be77958d9e;hpb=3d48d485cb9eca0283aa5f910c86e86a73242490;p=pspp diff --git a/src/output/html.c b/src/output/html.c index 8d20a61b37..9e7f567a27 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -64,11 +64,10 @@ 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 *space, const char *newline); static void print_title_tag (FILE *file, const char *name, const char *content); @@ -201,7 +200,7 @@ print_title_tag (FILE *file, const char *name, const char *content) if (content != NULL) { fprintf (file, "<%s>", name); - escape_string (file, content, strlen (content), " "); + escape_string (file, content, strlen (content), " ", " - "); fprintf (file, "\n", name); } } @@ -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) @@ -276,7 +274,7 @@ html_submit (struct output_driver *driver, case TEXT_ITEM_COMMAND_OPEN: fprintf (html->file, "
file, s, strlen (s), "_"); + escape_string (html->file, s, strlen (s), "_", "
"); fprintf (html->file, "\">"); print_title_tag (html->file, "H3", s); break; @@ -291,7 +289,7 @@ html_submit (struct output_driver *driver, case TEXT_ITEM_SYNTAX: fprintf (html->file, "
");
-          escape_string (html->file, s, strlen (s), " ");
+          escape_string (html->file, s, strlen (s), " ", "
");
           fprintf (html->file, "
\n"); break; @@ -327,19 +325,23 @@ html_submit (struct output_driver *driver, } } -/* Write LENGTH characters in TEXT to file F, escaping characters - as necessary for HTML. Spaces are replaced by SPACE, which - should be " " or " ". */ +/* 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 "
" or "\n" or + something else appropriate. */ static void escape_string (FILE *file, const char *text, size_t length, - const char *space) + const char *space, const char *newline) { while (length-- > 0) { char c = *text++; switch (c) { + case '\n': + fputs (newline, file); + break; case '&': fputs ("&", file); break; @@ -372,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, "", table_nc (t)); + *tfoot = true; + } + else + fputs ("\n
", html->file); +} - fputs ("\n", html->file); +static void +html_output_table (struct html_driver *html, const struct table_item *item) +{ + const struct table *t = table_item_get_table (item); + const char *title = table_item_get_title (item); + const char *caption = table_item_get_caption (item); + int footnote_idx = 0; + bool tfoot = false; + int y; + + fputs ("
", html->file); - if (caption != NULL) + if (caption) + { + put_tfoot (html, t, &tfoot); + escape_string (html->file, caption, strlen (caption), " ", "
"); + } + footnote_idx = 0; + for (y = 0; y < table_nr (t); y++) + { + int x; + + for (x = 0; x < table_nc (t); ) + { + const struct cell_contents *c; + struct table_cell cell; + + table_get_cell (t, x, y, &cell); + if (y != cell.d[TABLE_VERT][0]) + continue; + + for (c = cell.contents; c < &cell.contents[cell.n_contents]; c++) + { + int i; + + for (i = 0; i < c->n_footnotes; i++) + { + char marker[16]; + + put_tfoot (html, t, &tfoot); + str_format_26adic (++footnote_idx, false, marker, sizeof marker); + fprintf (html->file, "%s ", marker); + escape_string (html->file, c->footnotes[i], + strlen (c->footnotes[i]), " ", "
"); + } + } + x = cell.d[TABLE_HORZ][1]; + table_cell_free (&cell); + } + } + if (tfoot) + fputs ("\n", html->file); + footnote_idx = 0; + + fputs ("\n", html->file); + + if (title != NULL) { fputs (" \n", html->file); } for (y = 0; y < table_nr (t); y++) { + int x; + fputs (" \n", html->file); - for (x = 0; x < table_nc (t); x++) + for (x = 0; x < table_nc (t); ) { const struct cell_contents *c; struct table_cell cell; @@ -464,30 +528,48 @@ html_output_table (struct html_driver *html, if (c->text) { const char *s = c->text; + int i; if (c->options & TAB_EMPH) fputs ("", html->file); if (c->options & TAB_FIX) { fputs ("", html->file); - escape_string (html->file, s, strlen (s), " "); + escape_string (html->file, s, strlen (s), " ", "
"); fputs ("", html->file); } else { s += strspn (s, CC_SPACES); - escape_string (html->file, s, strlen (s), " "); + escape_string (html->file, s, strlen (s), " ", "
"); } if (c->options & TAB_EMPH) fputs ("", html->file); + + if (c->n_footnotes > 0) + { + fputs ("", html->file); + for (i = 0; i < c->n_footnotes; i++) + { + char marker[16]; + + if (i > 0) + putc (',', html->file); + str_format_26adic (++footnote_idx, false, + marker, sizeof marker); + fputs (marker, html->file); + } + fputs ("", html->file); + } } else - html_output_table (html, c->table, NULL); + html_output_table (html, c->table); } /* Output or . */ fprintf (html->file, "\n", tag); + x = cell.d[TABLE_HORZ][1]; table_cell_free (&cell); } fputs (" \n", html->file);
", html->file); - escape_string (html->file, caption, strlen (caption), " "); + escape_string (html->file, title, strlen (title), " ", "
"); fputs ("