X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=60ca95e28dba029683e895dad42e0a7aac91c2a1;hb=5ce9c6ba1502e623ec6723a8273da77e5858b8d4;hp=e865642a6e518d9bb47e3afb00f8f1600631c90e;hpb=f8659933d48c5682010d1e1f04ae7acb5cbcd611;p=pspp
diff --git a/src/output/html.c b/src/output/html.c
index e865642a6e..60ca95e28d 100644
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -33,20 +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/image-item.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"
@@ -61,10 +55,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;
@@ -78,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,
@@ -202,10 +195,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)
{
@@ -256,89 +247,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))
+ switch (item->type)
{
- 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)
+ case OUTPUT_ITEM_CHART:
+ if (html->chart_file_name)
{
- fprintf (html->file, "", file_name);
- free (file_name);
+ char *file_name = xr_draw_png_chart (item->chart,
+ html->chart_file_name,
+ html->chart_cnt++,
+ &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);
+ }
}
- }
- else if (is_chart_item (output_item) && html->chart_file_name != NULL)
- {
- 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)
+ 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 OUTPUT_ITEM_IMAGE:
+ 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_write_png_image (
+ item->image, html->chart_file_name, ++html->chart_cnt);
+ if (file_name != NULL)
+ {
+ fprintf (html->file, "
", file_name);
+ 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_MESSAGE:
+ fprintf (html->file, "
");
+
+ char *s = msg_to_string (item->message);
+ escape_string (html->file, s, " ", "
");
+ free (s);
+
+ fprintf (html->file, "
"); - escape_string (html->file, s, " ", "\n"); - break; + case TEXT_ITEM_TITLE: + { + char tag[3] = { 'H', MIN (5, level) + '0', '\0' }; + print_title_tag (html->file, tag, s); + } + break; + + case TEXT_ITEM_SYNTAX: + fprintf (html->file, "
"); - 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, "
");
- escape_string (html->file, s, " ", "
");
- fprintf (html->file, "
");
- escape_string (html->file, s, " ", "
");
- fprintf (html->file, "