X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=38b89719a443095bf3456437a05b81bb6f6c450d;hb=3d183ce2adfc32a104c91baa3ab5909d6f7afaa1;hp=822c6b5c9b8f9c6c6844a49760f405f26e4694d7;hpb=b51ab36f5a828654ed03e96c90a1241852f6d70c;p=pspp diff --git a/src/output/html.c b/src/output/html.c index 822c6b5c9b..38b89719a4 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ #include #include "data/file-name.h" +#include "data/file-handle-def.h" #include "libpspp/assertion.h" #include "libpspp/cast.h" #include "libpspp/compiler.h" @@ -47,11 +48,11 @@ struct html_driver { struct output_driver driver; - +#ifdef HAVE_CAIRO struct xr_color fg; struct xr_color bg; - - char *file_name; +#endif + struct file_handle *handle; char *chart_file_name; char *command_name; @@ -64,10 +65,10 @@ struct html_driver static const struct output_driver_class html_driver_class; -static void html_output_table (struct html_driver *, struct table_item *); +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); @@ -86,7 +87,7 @@ opt (struct output_driver *d, struct string_map *options, const char *key, } static struct output_driver * -html_create (const char *file_name, enum settings_output_devices device_type, +html_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { struct output_driver *d; @@ -94,24 +95,24 @@ html_create (const char *file_name, enum settings_output_devices device_type, html = xzalloc (sizeof *html); d = &html->driver; - output_driver_init (&html->driver, &html_driver_class, file_name, + output_driver_init (&html->driver, &html_driver_class, fh_get_file_name (fh), device_type); html->css = parse_boolean (opt (d, o, "css", "true")); html->borders = parse_boolean (opt (d, o, "borders", "true")); - html->file_name = xstrdup (file_name); + html->handle = fh; html->chart_file_name = parse_chart_file_name (opt (d, o, "charts", - file_name)); + fh_get_file_name (fh))); html->file = NULL; html->chart_cnt = 1; - +#ifdef HAVE_CAIRO parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &html->bg); parse_color (d, o, "foreground-color", "#000000000000", &html->fg); - - html->file = fn_open (html->file_name, "w"); +#endif + html->file = fn_open (html->handle, "w"); if (html->file == NULL) { - msg_error (errno, _("error opening output file `%s'"), html->file_name); + msg_error (errno, _("error opening output file `%s'"), fh_get_file_name (html->handle)); goto error; } @@ -200,7 +201,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); } } @@ -216,10 +217,10 @@ html_destroy (struct output_driver *driver) "\n" "\n" "\n"); - fn_close (html->file_name, html->file); + fn_close (html->handle, html->file); } free (html->chart_file_name); - free (html->file_name); + fh_unref (html->handle); free (html->command_name); free (html); } @@ -274,7 +275,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; @@ -289,7 +290,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; @@ -325,19 +326,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; @@ -370,37 +375,98 @@ put_border (FILE *file, int n_borders, int style, const char *border_name) } static void -html_output_table (struct html_driver *html, struct table_item *item) +put_tfoot (struct html_driver *html, const struct table *t, bool *tfoot) +{ + if (!*tfoot) + { + fprintf (html->file, "", table_nc (t)); + *tfoot = true; + } + else + 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 *caption; - int x, y; + 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 ("\n", html->file); + fputs ("
", html->file); - caption = table_item_get_caption (item); - 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]) + goto next_0; + + 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]), " ", "
"); + } + } + + next_0: + 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; const char *tag; bool is_header; int alignment, colspan, rowspan; int top, left, right, bottom, n_borders; - const char *s; table_get_cell (t, x, y, &cell); if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0]) - continue; + goto next_1; /* Output or . */ fprintf (html->file, "\n", tag); + next_1: + x = cell.d[TABLE_HORZ][1]; table_cell_free (&cell); } fputs (" \n", html->file); } - fputs ("
", html->file); - escape_string (html->file, caption, strlen (caption), " "); + escape_string (html->file, title, strlen (title), " ", "
"); fputs ("
or tag. */ is_header = (y < table_ht (t) @@ -410,7 +476,9 @@ html_output_table (struct html_driver *html, struct table_item *item) tag = is_header ? "TH" : "TD"; fprintf (html->file, " <%s", tag); - alignment = cell.options & TAB_ALIGNMENT; + alignment = (cell.n_contents > 0 + ? cell.contents[0].options & TAB_ALIGNMENT + : TAB_LEFT); if (alignment != TAB_LEFT) fprintf (html->file, " ALIGN=\"%s\"", alignment == TAB_RIGHT ? "RIGHT" : "CENTER"); @@ -427,14 +495,14 @@ html_output_table (struct html_driver *html, struct table_item *item) { /* Cell borders. */ n_borders = 0; - + top = table_get_rule (t, TABLE_VERT, x, y); if (top > TAL_GAP) put_border (html->file, n_borders++, top, "top"); - if (y == table_nr (t) - 1) + if (y + rowspan == table_nr (t)) { - bottom = table_get_rule (t, TABLE_VERT, x, y + 1); + bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan); if (bottom > TAL_GAP) put_border (html->file, n_borders++, bottom, "bottom"); } @@ -443,9 +511,9 @@ html_output_table (struct html_driver *html, struct table_item *item) if (left > TAL_GAP) put_border (html->file, n_borders++, left, "left"); - if (x == table_nc (t) - 1) + if (x + colspan == table_nc (t)) { - right = table_get_rule (t, TABLE_HORZ, x + 1, y); + right = table_get_rule (t, TABLE_HORZ, x + colspan, y); if (right > TAL_GAP) put_border (html->file, n_borders++, right, "right"); } @@ -457,32 +525,60 @@ html_output_table (struct html_driver *html, struct table_item *item) putc ('>', html->file); /* Output cell contents. */ - s = cell.contents; - if (cell.options & TAB_EMPH) - fputs ("", html->file); - if (cell.options & TAB_FIX) - { - fputs ("", html->file); - escape_string (html->file, s, strlen (s), " "); - fputs ("", html->file); - } - else + for (c = cell.contents; c < &cell.contents[cell.n_contents]; c++) { - s += strspn (s, CC_SPACES); - escape_string (html->file, s, strlen (s), " "); + 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), " ", "
"); + fputs ("", html->file); + } + else + { + s += strspn (s, CC_SPACES); + 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); } - if (cell.options & TAB_EMPH) - fputs ("", html->file); /* Output
\n\n", html->file); + fputs ("\n\n", html->file); } struct output_driver_factory html_driver_factory =