X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=f96e70ccb474b4af5283f0609b45c6ed4a265e39;hb=42d90dac4bc5ee06ef0dd3cd62b84378f16e7ea9;hp=8b16ffa780d29d07fc6cf8e9a2fdbab233ccd0ae;hpb=d6cbbc8d634fa91f050661355139a4e4697e99ab;p=pspp diff --git a/src/output/html.c b/src/output/html.c index 8b16ffa780..f96e70ccb4 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, 2013, 2014 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 @@ -40,7 +40,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,13 +50,12 @@ struct html_driver { struct output_driver driver; #ifdef HAVE_CAIRO - struct xr_color fg; - struct xr_color bg; -#endif + struct cell_color fg; + struct cell_color bg; +#endif struct file_handle *handle; char *chart_file_name; - char *command_name; FILE *file; size_t chart_cnt; @@ -66,8 +66,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); @@ -125,7 +124,7 @@ html_create (struct file_handle *fh, enum settings_output_devices device_type, fputs ("\n", html->file); - if ( html->css) + if (html->css) { fputs ("\n", html->file); @@ -200,8 +199,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, "%s>\n", name); } } @@ -221,7 +220,6 @@ html_destroy (struct output_driver *driver) } free (html->chart_file_name); fh_unref (html->handle); - free (html->command_name); free (html); } @@ -231,8 +229,6 @@ html_submit (struct output_driver *driver, { struct html_driver *html = html_driver_cast (driver); - output_driver_track_current_command (output_item, &html->command_name); - if (is_table_item (output_item)) { struct table_item *table_item = to_table_item (output_item); @@ -248,7 +244,7 @@ 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); @@ -265,81 +261,55 @@ html_submit (struct output_driver *driver, switch (text_item_get_type (text_item)) { - case TEXT_ITEM_TITLE: - print_title_tag (html->file, "H1", s); - break; - - case TEXT_ITEM_SUBTITLE: - print_title_tag (html->file, "H2", s); + case TEXT_ITEM_PAGE_TITLE: break; - case TEXT_ITEM_COMMAND_OPEN: - fprintf (html->file, "
"); - escape_string (html->file, s, strlen (s), " ", "\n"); break; - case TEXT_ITEM_PARAGRAPH: - print_title_tag (html->file, "P", s); - break; - - case TEXT_ITEM_MONOSPACE: + case TEXT_ITEM_LOG: print_title_tag (html->file, "PRE", s); /* should be
"); + escape_string (html->file, s, " ", "
"); fprintf (html->file, "
*/
break;
- case TEXT_ITEM_BLANK_LINE:
- fputs ("
", html->file);
- 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);
- const struct msg *msg = message_item_get_msg (message_item);
- char *s = msg_to_string (msg, html->command_name);
+ char *s = msg_to_string (message_item_get_msg (message_item));
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;
@@ -366,12 +336,56 @@ escape_string (FILE *file,
}
static void
-put_border (FILE *file, int n_borders, int style, const char *border_name)
+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, "%s>", tag);
+}
+
+static const char *
+border_to_css (int border)
+{
+ switch (border)
+ {
+ case TABLE_STROKE_NONE:
+ return NULL;
+
+ case TABLE_STROKE_SOLID:
+ return "solid";
+
+ case TABLE_STROKE_DASHED:
+ return "dashed";
+
+ case TABLE_STROKE_THICK:
+ return "thick solid";
+
+ case TABLE_STROKE_THIN:
+ return "thin solid";
+
+ case TABLE_STROKE_DOUBLE:
+ return "double";
+
+ default:
+ return NULL;
+ }
+
+}
+
+static void
+put_border (FILE *file, int *n_borders, int style, const char *border_name)
{
- fprintf (file, "%sborder-%s: %s",
- n_borders == 0 ? " STYLE=\"" : "; ",
- border_name,
- style == TAL_1 ? "thin solid" : "double");
+ const char *css = border_to_css (style);
+ if (css)
+ {
+ fprintf (file, "%sborder-%s: %s",
+ (*n_borders)++ == 0 ? " STYLE=\"" : "; ",
+ border_name, css);
+ }
}
static void
@@ -386,66 +400,90 @@ put_tfoot (struct html_driver *html, const struct table *t, bool *tfoot)
fputs ("\n
", html->file);
}
+static void
+html_put_footnote_markers (struct html_driver *html,
+ const struct footnote **footnotes,
+ size_t n_footnotes)
+{
+ if (n_footnotes > 0)
+ {
+ 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, " ", "
");
+ }
+ fputs ("", html->file);
+ }
+}
+
+static void
+html_put_table_item_text (struct html_driver *html,
+ const struct table_item_text *text)
+{
+ 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)
{
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);
+ const struct table_item_text *caption = table_item_get_caption (item);
if (caption)
{
put_tfoot (html, t, &tfoot);
- escape_string (html->file, caption, strlen (caption), " ", "
");
+ html_put_table_item_text (html, 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;
+ const struct footnote **f;
+ size_t n_footnotes = table_collect_footnotes (item, &f);
- 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);
- }
+ 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, " ", "
");
}
+ free (f);
if (tfoot)
fputs ("\n", html->file);
- footnote_idx = 0;
fputs ("\n", html->file);
- if (title != NULL)
+ 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 ("
");
+ if (title)
+ html_put_table_item_text (html, title);
+ if (title && layers)
+ fputs ("
\n", html->file);
+ if (layers)
+ html_put_table_item_layers (html, layers);
fputs ("\n", html->file);
- for (x = 0; x < table_nc (t); )
+ 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;
+ 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])
- continue;
+ goto next_1;
/* Output \n", html->file);
}
or tag. */
is_header = (y < table_ht (t)
@@ -475,12 +512,23 @@ html_output_table (struct html_driver *html, const struct table_item *item)
tag = is_header ? "TH" : "TD";
fprintf (html->file, " <%s", tag);
- alignment = (cell.n_contents > 0
- ? cell.contents[0].options & TAB_ALIGNMENT
- : TAB_LEFT);
- if (alignment != TAB_LEFT)
+ enum table_halign halign = table_halign_interpret (
+ cell.style->cell_style.halign, cell.options & TAB_NUMERIC);
+ if (halign != TABLE_HALIGN_LEFT)
+ {
+ 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);
+ }
+
+ if (cell.style->cell_style.valign != TABLE_VALIGN_TOP)
fprintf (html->file, " ALIGN=\"%s\"",
- alignment == TAB_RIGHT ? "RIGHT" : "CENTER");
+ (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM
+ ? "BOTTOM" : "MIDDLE"));
colspan = table_cell_colspan (&cell);
if (colspan > 1)
@@ -493,28 +541,27 @@ html_output_table (struct html_driver *html, const struct table_item *item)
if (html->borders)
{
/* 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");
+ 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");
if (y + rowspan == table_nr (t))
{
- bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan);
- if (bottom > TAL_GAP)
- put_border (html->file, n_borders++, bottom, "bottom");
+ bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan,
+ &color);
+ put_border (html->file, &n_borders, bottom, "bottom");
}
- left = table_get_rule (t, TABLE_HORZ, x, y);
- if (left > TAL_GAP)
- put_border (html->file, n_borders++, left, "left");
+ left = table_get_rule (t, TABLE_HORZ, x, y, &color);
+ put_border (html->file, &n_borders, left, "left");
if (x + colspan == table_nc (t))
{
- right = table_get_rule (t, TABLE_HORZ, x + colspan, y);
- if (right > TAL_GAP)
- put_border (html->file, n_borders++, right, "right");
+ right = table_get_rule (t, TABLE_HORZ, x + colspan, y,
+ &color);
+ put_border (html->file, &n_borders, right, "right");
}
if (n_borders > 0)
@@ -524,54 +571,36 @@ html_output_table (struct html_driver *html, const struct table_item *item)
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, " ", " or . */
fprintf (html->file, "%s>\n", tag);
+ next_1:
x = cell.d[TABLE_HORZ][1];
- table_cell_free (&cell);
}
fputs ("
");
+ else
+ {
+ s += strspn (s, CC_SPACES);
+ escape_string (html->file, s, " ", "
");
+ }
+
+ if (cell.n_subscripts)
{
- if (c->text)
+ fputs ("", html->file);
+ for (size_t i = 0; i < cell.n_subscripts; i++)
{
- 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);
- }
+ if (i)
+ putc (',', html->file);
+ escape_string (html->file, cell.subscripts[i],
+ " ", "
");
}
- else
- html_output_table (html, c->table);
+ fputs ("", html->file);
}
+ if (cell.superscript)
+ escape_tag (html->file, "SUP", cell.superscript, " ", "
");
+ html_put_footnote_markers (html, cell.footnotes, cell.n_footnotes);
/* Output