X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=3f07adcfeebd1dd634d19ba55c296054a21f0e5b;hb=a4c6ba6fe1a82efa5968584b274bc096ade11d24;hp=df7003a4a90cf4b9f74ff5bd000f954d375cbfc4;hpb=f2cd31f7b1219292350a798bf4c2c38d06ccca14;p=pspp
diff --git a/src/output/html.c b/src/output/html.c
index df7003a4a9..3f07adcfee 100644
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -33,14 +33,15 @@
#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/driver-provider.h"
+#include "output/image-item.h"
#include "output/message-item.h"
#include "output/options.h"
#include "output/output-item-provider.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"
@@ -58,10 +59,8 @@
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;
@@ -199,10 +198,8 @@ html_create (struct file_handle *fh, enum settings_output_devices device_type,
fh_get_file_name (fh)));
html->file = NULL;
html->chart_cnt = 1;
-#ifdef HAVE_CAIRO
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)
{
@@ -263,7 +260,17 @@ html_submit (struct output_driver *driver,
struct table_item *table_item = to_table_item (output_item);
html_output_table (html, table_item);
}
-#ifdef HAVE_CAIRO
+ else if (is_image_item (output_item) && html->chart_file_name != NULL)
+ {
+ struct image_item *image_item = to_image_item (output_item);
+ char *file_name = xr_write_png_image (
+ image_item->image, html->chart_file_name, ++html->chart_cnt);
+ if (file_name != NULL)
+ {
+ fprintf (html->file, "", file_name);
+ free (file_name);
+ }
+ }
else if (is_chart_item (output_item) && html->chart_file_name != NULL)
{
struct chart_item *chart_item = to_chart_item (output_item);
@@ -282,7 +289,6 @@ html_submit (struct output_driver *driver,
free (file_name);
}
}
-#endif /* HAVE_CAIRO */
else if (is_text_item (output_item))
{
struct text_item *text_item = to_text_item (output_item);
@@ -308,7 +314,9 @@ html_submit (struct output_driver *driver,
break;
case TEXT_ITEM_LOG:
- print_title_tag (html->file, "pre", s); /* should be
*/ + fprintf (html->file, "
");
+ escape_string (html->file, s, " ", "
");
+ 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 (" |
---|---|