X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=eb9e91e1ca9f9d3a01f425ec534c16f0281b4cff;hb=ac0b46916cf9c10ebe85bc51d83c9fb713903284;hp=84843cbd64eebb17d37aab86f21bce0d0eb55cfa;hpb=a353919df75c25331144602421353a856f4236d6;p=pspp diff --git a/src/output/html.c b/src/output/html.c index 84843cbd64..eb9e91e1ca 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -1,5 +1,6 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2017 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2017, + 2020 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 @@ -22,12 +23,14 @@ #include #include #include +#include #include "data/file-name.h" #include "data/file-handle-def.h" #include "libpspp/assertion.h" #include "libpspp/cast.h" #include "libpspp/compiler.h" +#include "libpspp/i18n.h" #include "libpspp/message.h" #include "libpspp/version.h" #include "output/cairo.h" @@ -40,7 +43,8 @@ #include "output/table-item.h" #include "output/text-item.h" -#include "xalloc.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -49,8 +53,8 @@ struct html_driver { struct output_driver driver; #ifdef HAVE_CAIRO - struct xr_color fg; - struct xr_color bg; + struct cell_color fg; + struct cell_color bg; #endif struct file_handle *handle; char *chart_file_name; @@ -58,6 +62,7 @@ struct html_driver FILE *file; size_t chart_cnt; + bool bare; bool css; bool borders; }; @@ -65,8 +70,7 @@ 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 escape_string (FILE *file, - const char *text, size_t length, +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, const char *content); @@ -85,50 +89,25 @@ opt (struct output_driver *d, struct string_map *options, const char *key, return driver_option_get (d, options, key, default_value); } -static struct output_driver * -html_create (struct file_handle *fh, enum settings_output_devices device_type, - struct string_map *o) +static void +put_header (struct html_driver *html) { - struct output_driver *d; - struct html_driver *html; - - html = xzalloc (sizeof *html); - d = &html->driver; - 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->handle = fh; - 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 - parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &html->bg); - parse_color (d, o, "foreground-color", "#000000000000", &html->fg); -#endif - html->file = fn_open (html->handle, "w"); - if (html->file == NULL) - { - msg_error (errno, _("error opening output file `%s'"), fh_get_file_name (html->handle)); - goto error; - } - - fputs ("\n", html->file); - fputs ("\n", html->file); - fputs ("\n", html->file); - print_title_tag (html->file, "TITLE", _("PSPP Output")); - fprintf (html->file, "\n", version); - fputs ("\n", html->file); - - if ( html->css) + fputs ("\n", html->file); + fprintf (html->file, "file, " lang=\"%s\"", ln); + free (ln); + fprintf (html->file, ">\n"); + fputs ("\n", html->file); + print_title_tag (html->file, "title", _("PSPP Output")); + fprintf (html->file, "\n", version); + fputs ("\n", html->file); + + if (html->css) { - fputs ("\n", - html->file); - fputs ("\n", + "\n", html->file); } - fputs ("\n", html->file); - fputs ("file); - fputs (" LINK=\"#1f00ff\" ALINK=\"#ff0000\" VLINK=\"#9900dd\">\n", html->file); + fputs ("\n", html->file); + fputs ("\n", html->file); +} + +static struct output_driver * +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); + d = &html->driver; + output_driver_init (&html->driver, &html_driver_class, fh_get_file_name (fh), + device_type); + html->bare = parse_boolean (opt (d, o, "bare", "false")); + html->css = parse_boolean (opt (d, o, "css", "true")); + html->borders = parse_boolean (opt (d, o, "borders", "true")); + + html->handle = fh; + 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 + parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &html->bg); + parse_color (d, o, "foreground-color", "#000000000000", &html->fg); +#endif + html->file = fn_open (html->handle, "w"); + if (html->file == NULL) + { + msg_error (errno, _("error opening output file `%s'"), fh_get_file_name (html->handle)); + goto error; + } + + if (!html->bare) + put_header (html); return d; @@ -199,8 +222,8 @@ print_title_tag (FILE *file, const char *name, const char *content) { if (content != NULL) { - fprintf (file, "<%s>", name); - escape_string (file, content, strlen (content), " ", " - "); + fprintf (file, "<%s>", name); + escape_string (file, content, " ", " - "); fprintf (file, "\n", name); } } @@ -212,10 +235,11 @@ html_destroy (struct output_driver *driver) if (html->file != NULL) { - fprintf (html->file, - "\n" - "\n" - "\n"); + if (!html->bare) + fprintf (html->file, + "\n" + "\n" + "\n"); fn_close (html->handle, html->file); } free (html->chart_file_name); @@ -244,11 +268,11 @@ html_submit (struct output_driver *driver, html->chart_cnt++, &html->fg, &html->bg - ); + ); if (file_name != NULL) { const char *title = chart_item_get_title (chart_item); - fprintf (html->file, " $\"Chart:$ ", + fprintf (html->file, " $\"chart:$ ", file_name, title ? title : _("No description")); free (file_name); } @@ -264,61 +288,52 @@ html_submit (struct output_driver *driver, case TEXT_ITEM_PAGE_TITLE: break; - case TEXT_ITEM_SUBHEAD: - print_title_tag (html->file, "H4", s); + 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 TEXT_ITEM_SYNTAX: - fprintf (html->file, "

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

\n"); - break; - - case TEXT_ITEM_PARAGRAPH: - print_title_tag (html->file, "P", s); - break; - - case TEXT_ITEM_MONOSPACE: - print_title_tag (html->file, "PRE", s); /* should be

*/ + fprintf (html->file, "

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

\n"); break; - case TEXT_ITEM_BLANK_LINE: - fputs (" ", html->file); + case TEXT_ITEM_LOG: + print_title_tag (html->file, "pre", s); /* should be */ break; case TEXT_ITEM_EJECT_PAGE: /* Nothing to do. */ break; - - case TEXT_ITEM_COMMENT: - case TEXT_ITEM_ECHO: - /* We print out syntax anyway, so nothing to do here either. */ - 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); + print_title_tag (html->file, "p", s); free (s); } } -/* 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. */ +/* 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. */ static void -escape_string (FILE *file, - const char *text, size_t length, +escape_string (FILE *file, const char *text, const char *space, const char *newline) { - while (length-- > 0) + for (;;) { char c = *text++; switch (c) { + case 0: + return; case '\n': fputs (newline, file); break; @@ -344,27 +359,39 @@ escape_string (FILE *file, } } +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) { switch (border) { - case TAL_NONE: + case TABLE_STROKE_NONE: return NULL; - case TAL_SOLID: + case TABLE_STROKE_SOLID: return "solid"; - case TAL_DASHED: + case TABLE_STROKE_DASHED: return "dashed"; - case TAL_THICK: + case TABLE_STROKE_THICK: return "thick solid"; - case TAL_THIN: + case TABLE_STROKE_THIN: return "thin solid"; - case TAL_DOUBLE: + case TABLE_STROKE_DOUBLE: return "double"; default: @@ -373,15 +400,46 @@ border_to_css (int border) } +struct css_style +{ + FILE *file; + int n_styles; +}; + +static struct css_style * +style_start (FILE *file) +{ + struct css_style *cs = XMALLOC (struct css_style); + cs->file = file; + cs->n_styles = 0; + fputs (" style=\"", file); + return cs; +} + +static void +style_end (struct css_style *cs) +{ + fputs ("\"", cs->file); + free (cs); +} + +static void +put_style (struct css_style *st, const char *name, const char *value) +{ + if (st->n_styles++ > 0) + fputs ("; ", st->file); + fprintf (st->file, "%s: %s", name, value); +} + static void -put_border (FILE *file, int *n_borders, int style, const char *border_name) +put_border (struct css_style *st, int style, const char *border_name) { const char *css = border_to_css (style); if (css) { - fprintf (file, "%sborder-%s: %s", - (*n_borders)++ == 0 ? " STYLE=\"" : "; ", - border_name, css); + if (st->n_styles++ > 0) + fputs ("; ", st->file); + fprintf (st->file, "border-%s: %s", border_name, css); } } @@ -390,11 +448,13 @@ put_tfoot (struct html_driver *html, const struct table *t, bool *tfoot) { if (!*tfoot) { - fprintf (html->file, "", table_nc (t)); + fputs ("\n", html->file); + fputs ("\n", html->file); + fprintf (html->file, "\n", table_nc (t)); *tfoot = true; } else - fputs ("\n ", html->file); + fputs ("\n ", html->file); } static void @@ -404,17 +464,16 @@ html_put_footnote_markers (struct html_driver *html, { if (n_footnotes > 0) { - fputs ("^{", html->file); + fputs ("^{", html->file); for (size_t i = 0; i < n_footnotes; i++) { const struct footnote *f = footnotes[i]; if (i > 0) putc (',', html->file); - escape_string (html->file, f->marker, - strlen (f->marker), " ", " "); + escape_string (html->file, f->marker, " ", " "); } - fputs ("}", html->file); + fputs ("}", html->file); } } @@ -422,11 +481,25 @@ static void html_put_table_item_text (struct html_driver *html, const struct table_item_text *text) { - escape_string (html->file, text->content, strlen (text->content), - " ", " "); + escape_string (html->file, text->content, " ", " "); html_put_footnote_markers (html, text->footnotes, text->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 (i) + fputs (" \n", 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); + } +} + static void html_output_table (struct html_driver *html, const struct table_item *item) { @@ -434,7 +507,7 @@ html_output_table (struct html_driver *html, const struct table_item *item) bool tfoot = false; int y; - fputs ("", html->file); + fputs ("\n", html->file); const struct table_item_text *caption = table_item_get_caption (item); if (caption) @@ -446,151 +519,156 @@ html_output_table (struct html_driver *html, const struct table_item *item) size_t n_footnotes = table_collect_footnotes (item, &f); for (size_t i = 0; i < n_footnotes; i++) - if (f[i]) - { - put_tfoot (html, t, &tfoot); - fputs ("^{", html->file); - escape_string (html->file, f[i]->marker, strlen (f[i]->marker), - " ", " "); - fputs ("} ", html->file); - escape_string (html->file, f[i]->content, strlen (f[i]->content), - " ", " "); - } + { + 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); + fputs ("\n", html->file); + } const struct table_item_text *title = table_item_get_title (item); - const struct table_item_text *layers = table_item_get_layers (item); + const struct table_item_layers *layers = table_item_get_layers (item); if (title || layers) { - fputs (" \n", html->file); + html_put_table_item_layers (html, layers); + fputs ("\n", html->file); } + 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); ) + fputs ("\n", html->file); + for (x = 0; x < table_nc (t);) { - const struct cell_contents *c; struct table_cell cell; const char *tag; - bool is_header; - int colspan, rowspan; - int top, left, right, bottom; 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 . */ + /* output or . */ fprintf (html->file, "\n", tag); - next_1: + next_1: x = cell.d[TABLE_HORZ][1]; - table_cell_free (&cell); } - fputs (" \n", html->file); + fputs ("\n", html->file); } - fputs (" ", html->file); + fputs ("", html->file); if (title) html_put_table_item_text (html, title); if (title && layers) - fputs (" \n", html->file); + fputs (" \n", html->file); if (layers) - html_put_table_item_text (html, layers); - fputs (" or tag. */ - is_header = (y < table_ht (t) + /* output 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); - - int halign = (cell.n_contents > 0 - ? cell.contents[0].options & TAB_HALIGN - : TAB_LEFT); - if (halign != TAB_LEFT) - fprintf (html->file, " ALIGN=\"%s\"", - halign == TAB_RIGHT ? "RIGHT" : "CENTER"); - - int valign = (cell.n_contents > 0 - ? cell.contents[0].options & TAB_VALIGN - : TAB_LEFT); - if (valign != TAB_TOP) - fprintf (html->file, " ALIGN=\"%s\"", - valign == TAB_BOTTOM ? "BOTTOM" : "MIDDLE"); - - colspan = table_cell_colspan (&cell); - if (colspan > 1) - fprintf (html->file, " COLSPAN=\"%d\"", colspan); + tag = is_header ? "th" : "td"; + fprintf (html->file, "<%s", tag); - rowspan = table_cell_rowspan (&cell); - if (rowspan > 1) - fprintf (html->file, " ROWSPAN=\"%d\"", rowspan); + struct css_style *style = style_start (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.style->cell_style.valign != TABLE_VALIGN_TOP) + { + put_style (style, "vertical-align", + (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM + ? "bottom" : "middle")); + } + + int colspan = table_cell_colspan (&cell); + int rowspan = table_cell_rowspan (&cell); if (html->borders) { /* Cell borders. */ - int n_borders = 0; - struct cell_color color; - top = table_get_rule (t, TABLE_VERT, x, y, &color); - put_border (html->file, &n_borders, top, "top"); + + int top = table_get_rule (t, TABLE_VERT, x, y, &color); + put_border (style, top, "top"); if (y + rowspan == table_nr (t)) { - bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan, + int bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan, &color); - put_border (html->file, &n_borders, bottom, "bottom"); + put_border (style, bottom, "bottom"); } - left = table_get_rule (t, TABLE_HORZ, x, y, &color); - put_border (html->file, &n_borders, left, "left"); + int left = table_get_rule (t, TABLE_HORZ, x, y, &color); + put_border (style, left, "left"); if (x + colspan == table_nc (t)) { - right = table_get_rule (t, TABLE_HORZ, x + colspan, y, + int right = table_get_rule (t, TABLE_HORZ, x + colspan, y, &color); - put_border (html->file, &n_borders, right, "right"); + put_border (style, right, "right"); } - - if (n_borders > 0) - fputs ("\"", html->file); } + style_end (style); + + if (colspan > 1) + fprintf (html->file, " colspan=\"%d\"", colspan); + + if (rowspan > 1) + fprintf (html->file, " rowspan=\"%d\"", rowspan); putc ('>', html->file); /* Output cell contents. */ - for (c = cell.contents; c < &cell.contents[cell.n_contents]; c++) + const char *s = cell.text; + if (cell.options & TAB_FIX) + escape_tag (html->file, "tt", s, " ", " "); + else { - const char *s = c->text; + s += strspn (s, CC_SPACES); + escape_string (html->file, s, " ", " "); + } - 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 + if (cell.n_subscripts) + { + fputs ("_{", html->file); + for (size_t i = 0; i < cell.n_subscripts; i++) { - s += strspn (s, CC_SPACES); - escape_string (html->file, s, strlen (s), " ", " "); + if (i) + putc (',', html->file); + escape_string (html->file, cell.subscripts[i], + " ", " "); } - if (c->options & TAB_EMPH) - fputs ("}", html->file); - - html_put_footnote_markers (html, c->footnotes, c->n_footnotes); + fputs ("", html->file); } + if (cell.superscript) + escape_tag (html->file, "sup", cell.superscript, " ", " "); + html_put_footnote_markers (html, cell.footnotes, cell.n_footnotes); - /* Output \n\n", html->file); + fputs ("\n", html->file); + fputs ("\n\n", html->file); } struct output_driver_factory html_driver_factory =