From 865bc07bb98f77536103372c1b070f62f8f693a2 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 5 Jul 2020 08:15:20 +0200 Subject: [PATCH] html.c: Reimplement as HTML5 --- NEWS | 2 + src/output/html.c | 241 ++++++++++++++++++++++++++++------------------ 2 files changed, 149 insertions(+), 94 deletions(-) diff --git a/NEWS b/NEWS index ef7fd4938a..8e562cdd84 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ Please send PSPP bug reports to bug-gnu-pspp@gnu.org. Changes from 1.4.0 to 1.5.0: + * HTML output is now HTML5 instead of HTML4.0 Transitional. + Changes from 1.2.0 to 1.4.0: * The file pspp-mode.el (the pspp-mode for Emacs) is no longer distributed diff --git a/src/output/html.c b/src/output/html.c index 635ae5254e..3fb6bb83b5 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" @@ -115,20 +118,22 @@ html_create (struct file_handle *fh, enum settings_output_devices device_type, 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); + 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); return d; @@ -213,8 +227,8 @@ html_destroy (struct output_driver *driver) if (html->file != NULL) { fprintf (html->file, - "\n" - "\n" + "\n" + "\n" "\n"); fn_close (html->handle, html->file); } @@ -248,7 +262,7 @@ html_submit (struct output_driver *driver, 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); } @@ -273,13 +287,13 @@ html_submit (struct output_driver *driver, break; case TEXT_ITEM_SYNTAX: - fprintf (html->file, "

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

\n"); + fprintf (html->file, "

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

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

*/ + print_title_tag (html->file, "pre", s); /* should be

*/ break; case TEXT_ITEM_EJECT_PAGE: @@ -291,7 +305,7 @@ html_submit (struct output_driver *driver, { 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); } } @@ -376,15 +390,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); } } @@ -393,11 +438,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 @@ -407,16 +454,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, " ", " "); + escape_string (html->file, f->marker, " ", " "); } - fputs ("}", html->file); + fputs ("}", html->file); } } @@ -424,7 +471,7 @@ static void html_put_table_item_text (struct html_driver *html, const struct table_item_text *text) { - escape_string (html->file, text->content, " ", " "); + escape_string (html->file, text->content, " ", " "); html_put_footnote_markers (html, text->footnotes, text->n_footnotes); } @@ -435,10 +482,10 @@ html_put_table_item_layers (struct html_driver *html, for (size_t i = 0; i < layers->n_layers; i++) { if (i) - fputs (" \n", html->file); + fputs (" \n", html->file); const struct table_item_layer *layer = &layers->layers[i]; - escape_string (html->file, layer->content, " ", " "); + escape_string (html->file, layer->content, " ", " "); html_put_footnote_markers (html, layer->footnotes, layer->n_footnotes); } } @@ -450,7 +497,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) @@ -464,148 +511,154 @@ html_output_table (struct html_driver *html, const struct table_item *item) for (size_t i = 0; i < n_footnotes; i++) { put_tfoot (html, t, &tfoot); - escape_tag (html->file, "SUP", f[i]->marker, " ", " "); - escape_string (html->file, f[i]->content, " ", " "); + 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_layers *layers = table_item_get_layers (item); if (title || layers) { - fputs (" \n", html->file); + fputs ("\n", html->file); } + fputs ("\n", html->file); + for (y = 0; y < table_nr (t); y++) { int x; - fputs (" \n", html->file); + fputs ("\n", html->file); for (x = 0; x < table_nc (t);) { 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]; } - 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_layers (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); + tag = is_header ? "th" : "td"; + fprintf (html->file, "<%s", 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); - if (halign != TABLE_HALIGN_LEFT) + + switch (halign) { - fprintf (html->file, " ALIGN=\"%s\"", - (halign == TABLE_HALIGN_RIGHT ? "RIGHT" - : halign == TABLE_HALIGN_CENTER ? "CENTER" - : "CHAR")); - if (cell.style->cell_style.decimal_char) - fprintf (html->file, " CHAR=\"%c\"", - cell.style->cell_style.decimal_char); + 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) - fprintf (html->file, " VALIGN=\"%s\"", - (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM - ? "BOTTOM" : "MIDDLE")); + { + put_style (style, "vertical-align", + (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM + ? "bottom" : "middle")); + } - colspan = table_cell_colspan (&cell); - if (colspan > 1) - fprintf (html->file, " COLSPAN=\"%d\"", colspan); - - rowspan = table_cell_rowspan (&cell); - if (rowspan > 1) - fprintf (html->file, " ROWSPAN=\"%d\"", rowspan); + 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. */ const char *s = cell.text; if (cell.options & TAB_FIX) - escape_tag (html->file, "TT", s, " ", " "); + escape_tag (html->file, "tt", s, " ", " "); else { s += strspn (s, CC_SPACES); - escape_string (html->file, s, " ", " "); + escape_string (html->file, s, " ", " "); } if (cell.n_subscripts) { - fputs ("_{", html->file); + fputs ("_{", html->file); for (size_t i = 0; i < cell.n_subscripts; i++) { if (i) putc (',', html->file); escape_string (html->file, cell.subscripts[i], - " ", " "); + " ", " "); } - fputs ("}", html->file); + fputs ("}", html->file); } if (cell.superscript) - escape_tag (html->file, "SUP", 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 = -- 2.30.2