X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=9e7f567a27274866efda6d67fddef2ca74082d3c;hb=63c7521729b947ace9e192dff9330813ecfb5812;hp=8b062134cde99c0a7f8abf0a02809708fa113dea;hpb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;p=pspp
diff --git a/src/output/html.c b/src/output/html.c
index 8b062134cd..9e7f567a27 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 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014 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
@@ -39,7 +39,6 @@
#include "output/table-item.h"
#include "output/text-item.h"
-#include "error.h"
#include "xalloc.h"
#include "gettext.h"
@@ -48,7 +47,10 @@
struct html_driver
{
struct output_driver driver;
-
+#ifdef HAVE_CAIRO
+ struct xr_color fg;
+ struct xr_color bg;
+#endif
char *file_name;
char *chart_file_name;
@@ -56,15 +58,16 @@ struct html_driver
FILE *file;
size_t chart_cnt;
- bool in_syntax;
+ bool css;
+ bool borders;
};
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);
@@ -93,17 +96,22 @@ html_create (const char *file_name, enum settings_output_devices device_type,
d = &html->driver;
output_driver_init (&html->driver, &html_driver_class, file_name,
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->chart_file_name = parse_chart_file_name (opt (d, o, "charts",
file_name));
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->file_name, "w");
if (html->file == NULL)
{
- error (0, errno, _("error opening output file `%s'"), html->file_name);
+ msg_error (errno, _("error opening output file `%s'"), html->file_name);
goto error;
}
@@ -112,63 +120,67 @@ html_create (const char *file_name, enum settings_output_devices device_type,
fputs ("\n", html->file);
fputs ("
\n", html->file);
print_title_tag (html->file, "TITLE", _("PSPP Output"));
- 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,14 +288,9 @@ html_submit (struct output_driver *driver,
break;
case TEXT_ITEM_SYNTAX:
- if (!html->in_syntax)
- {
- fprintf (html->file, "
");
- html->in_syntax = true;
- }
- else
- putc ('\n', html->file);
- escape_string (html->file, s, strlen (s), " ");
+ fprintf (html->file, "");
+ escape_string (html->file, s, strlen (s), " ", "
");
+ fprintf (html->file, "
\n");
break;
case TEXT_ITEM_PARAGRAPH:
@@ -331,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;
@@ -376,33 +374,93 @@ 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])
+ 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 (" ", html->file);
- escape_string (html->file, caption, strlen (caption), " ");
+ escape_string (html->file, title, strlen (title), " ", " ");
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])
@@ -416,79 +474,112 @@ 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",
+ fprintf (html->file, " ALIGN=\"%s\"",
alignment == TAB_RIGHT ? "RIGHT" : "CENTER");
colspan = table_cell_colspan (&cell);
if (colspan > 1)
- fprintf (html->file, " COLSPAN=%d", colspan);
+ fprintf (html->file, " COLSPAN=\"%d\"", colspan);
rowspan = table_cell_rowspan (&cell);
if (rowspan > 1)
- fprintf (html->file, " ROWSPAN=%d", rowspan);
+ fprintf (html->file, " ROWSPAN=\"%d\"", rowspan);
- /* Cell borders. */
- n_borders = 0;
+ 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");
-
- if (y == table_nr (t) - 1)
- {
- bottom = table_get_rule (t, TABLE_VERT, x, y + 1);
- if (bottom > TAL_GAP)
- 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");
-
- if (x == table_nc (t) - 1)
- {
- right = table_get_rule (t, TABLE_HORZ, x + 1, y);
- if (right > TAL_GAP)
- put_border (html->file, n_borders++, right, "right");
- }
-
- if (n_borders > 0)
- fputs ("\"", html->file);
+ top = table_get_rule (t, TABLE_VERT, x, y);
+ if (top > TAL_GAP)
+ 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");
+ }
+
+ left = table_get_rule (t, TABLE_HORZ, x, y);
+ if (left > TAL_GAP)
+ 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");
+ }
+
+ if (n_borders > 0)
+ fputs ("\"", html->file);
+ }
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 or . */
fprintf (html->file, "%s>\n", tag);
+ x = cell.d[TABLE_HORZ][1];
table_cell_free (&cell);
}
fputs (" \n", html->file);
}
- fputs (" \n\n", html->file);
+ fputs (" \n\n", html->file);
}
-struct output_driver_factory html_driver_factory = { "html", html_create };
+struct output_driver_factory html_driver_factory =
+ { "html", "pspp.html", html_create };
static const struct output_driver_class html_driver_class =
{
|