X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=a2e63f943888169a1e30458f6b7d0b100bc6e102;hb=4fd6d0378134d9653966258f44b0b0f8db15fbd5;hp=31fa063f519b24b19806ffa11657960e7ca61f21;hpb=28e907dd4809de2c44feb9f402ab7f19660d6459;p=pspp
diff --git a/src/output/html.c b/src/output/html.c
index 31fa063f51..a2e63f9438 100644
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -33,17 +33,14 @@
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/version.h"
-#ifdef HAVE_CAIRO
#include "output/cairo-chart.h"
-#endif
-#include "output/chart-item.h"
+#include "output/chart.h"
#include "output/driver-provider.h"
-#include "output/message-item.h"
#include "output/options.h"
-#include "output/output-item-provider.h"
+#include "output/output-item.h"
+#include "output/pivot-output.h"
+#include "output/pivot-table.h"
#include "output/table-provider.h"
-#include "output/table-item.h"
-#include "output/text-item.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
@@ -58,15 +55,13 @@
struct html_driver
{
struct output_driver driver;
-#ifdef HAVE_CAIRO
struct cell_color fg;
struct cell_color bg;
-#endif
struct file_handle *handle;
char *chart_file_name;
FILE *file;
- size_t chart_cnt;
+ size_t n_charts;
bool bare;
bool css;
@@ -75,7 +70,8 @@ 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 html_output_table (struct html_driver *,
+ const struct output_item *);
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,
@@ -184,9 +180,7 @@ 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);
+ struct html_driver *html = XZALLOC (struct html_driver);
d = &html->driver;
output_driver_init (&html->driver, &html_driver_class, fh_get_file_name (fh),
device_type);
@@ -198,11 +192,9 @@ html_create (struct file_handle *fh, enum settings_output_devices device_type,
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
+ html->n_charts = 1;
html->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF"));
html->fg = parse_color (opt (d, o, "foreground-color", "#000000000000"));
-#endif
html->file = fn_open (html->handle, "w");
if (html->file == NULL)
{
@@ -253,78 +245,106 @@ html_destroy (struct output_driver *driver)
}
static void
-html_submit (struct output_driver *driver,
- const struct output_item *output_item)
+html_submit__ (struct output_driver *driver, const struct output_item *item,
+ int level)
{
struct html_driver *html = html_driver_cast (driver);
- if (is_table_item (output_item))
- {
- struct table_item *table_item = to_table_item (output_item);
- html_output_table (html, table_item);
- }
-#ifdef HAVE_CAIRO
- else if (is_chart_item (output_item) && html->chart_file_name != NULL)
+ switch (item->type)
{
- struct chart_item *chart_item = to_chart_item (output_item);
- char *file_name;
-
- file_name = xr_draw_png_chart (chart_item, html->chart_file_name,
- html->chart_cnt++,
- &html->fg,
- &html->bg
- );
- if (file_name != NULL)
+ case OUTPUT_ITEM_CHART:
+ if (html->chart_file_name)
{
- const char *title = chart_item_get_title (chart_item);
- fprintf (html->file, "",
- file_name, title ? title : _("No description"));
- free (file_name);
+ char *file_name = xr_draw_png_chart (item->chart,
+ html->chart_file_name,
+ html->n_charts++,
+ &html->fg, &html->bg);
+ if (file_name != NULL)
+ {
+ const char *title = chart_get_title (item->chart);
+ fprintf (html->file, "
",
+ file_name, title ? title : _("No description"));
+ free (file_name);
+ }
}
- }
-#endif /* HAVE_CAIRO */
- else if (is_text_item (output_item))
- {
- struct text_item *text_item = to_text_item (output_item);
- const char *s = text_item_get_text (text_item);
+ break;
- switch (text_item_get_type (text_item))
- {
- case TEXT_ITEM_PAGE_TITLE:
- break;
+ case OUTPUT_ITEM_GROUP:
+ for (size_t i = 0; i < item->group.n_children; i++)
+ html_submit__ (driver, item->group.children[i], level + 1);
+ break;
- 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, " ", "\n"); - break; - - case TEXT_ITEM_LOG: - fprintf (html->file, "
"); - fprintf (html->file, "
");
- escape_string (html->file, s, " ", "
");
- fprintf (html->file, "
");
+
+ char *s = msg_to_string (item->message);
escape_string (html->file, s, " ", "
");
- fprintf (html->file, "
"); + escape_string (html->file, s, " ", "\n"); + break; + + case TEXT_ITEM_LOG: + fprintf (html->file, "
"); + fprintf (html->file, "
");
+ escape_string (html->file, s, " ", "
");
+ fprintf (html->file, "
or | tag. */ - bool is_header = (y < t->h[V][0] - || y >= t->n[V] - t->h[V][1] - || x < t->h[H][0] - || x >= t->n[H] - t->h[H][1]); - tag = is_header ? "th" : "td"; - fprintf (html->file, "<%s", tag); - - struct css_style style; - style_start (&style, html->file); - enum table_halign halign = table_halign_interpret ( - cell.style->cell_style.halign, cell.options & TAB_NUMERIC); - - switch (halign) + table_get_cell (body, x, y, &cell); + if (x == cell.d[TABLE_HORZ][0] && y == cell.d[TABLE_VERT][0]) { - 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; + bool is_header = (y < body->h[V][0] + || y >= body->n[V] - body->h[V][1] + || x < body->h[H][0] + || x >= body->n[H] - body->h[H][1]); + const char *tag = is_header ? "th" : "td"; + html_put_table_cell (html, pt, &cell, tag, body); } - if (cell.options & TAB_ROTATE) - put_style (&style, "writing-mode", "sideways-lr"); - - if (cell.style->cell_style.valign != TABLE_VALIGN_TOP) - { - put_style (&style, "vertical-align", - (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM - ? "bottom" : "middle")); - } - - const struct font_style *fs = &cell.style->font_style; - char bgcolor[32]; - if (format_color (fs->bg[y % 2], - (struct cell_color) CELL_COLOR_WHITE, - bgcolor, sizeof bgcolor)) - put_style (&style, "background", bgcolor); - - char fgcolor[32]; - if (format_color (fs->fg[y % 2], - (struct cell_color) CELL_COLOR_BLACK, - fgcolor, sizeof fgcolor)) - put_style (&style, "color", fgcolor); - - if (fs->typeface) - { - put_style (&style, "font-family", "\""); - escape_string (html->file, fs->typeface, " ", "\n"); - putc ('"', html->file); - } - if (fs->bold) - put_style (&style, "font-weight", "bold"); - if (fs->italic) - put_style (&style, "font-style", "italic"); - if (fs->underline) - put_style (&style, "text-decoration", "underline"); - if (fs->size) - { - char buf[32]; - snprintf (buf, sizeof buf, "%dpt", fs->size); - put_style (&style, "font-size", buf); - } - - int colspan = table_cell_colspan (&cell); - int rowspan = table_cell_rowspan (&cell); - - if (html->borders) - { - /* Cell borders. */ - struct cell_color color; - - int top = table_get_rule (t, TABLE_VERT, x, y, &color); - put_border (&style, top, &color, "top"); - - if (y + rowspan == t->n[V]) - { - int bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan, - &color); - put_border (&style, bottom, &color, "bottom"); - } - - int left = table_get_rule (t, TABLE_HORZ, x, y, &color); - put_border (&style, left, &color, "left"); + x = cell.d[TABLE_HORZ][1]; + } + fputs (" |
---|---|