X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=a2e63f943888169a1e30458f6b7d0b100bc6e102;hb=80ff0f10da00eae4c7b3b07266a03e403e97d640;hp=3f07adcfeebd1dd634d19ba55c296054a21f0e5b;hpb=abc77034fd0bf89464c491ca3b573f6c3ab17648;p=pspp

diff --git a/src/output/html.c b/src/output/html.c
index 3f07adcfee..a2e63f9438 100644
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -34,17 +34,13 @@
 #include "libpspp/message.h"
 #include "libpspp/version.h"
 #include "output/cairo-chart.h"
-#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"
@@ -65,7 +61,7 @@ struct html_driver
     char *chart_file_name;
 
     FILE *file;
-    size_t chart_cnt;
+    size_t n_charts;
 
     bool bare;
     bool css;
@@ -74,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,
@@ -183,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);
@@ -197,7 +192,7 @@ 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;
+  html->n_charts = 1;
   html->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF"));
   html->fg = parse_color (opt (d, o, "foreground-color", "#000000000000"));
   html->file = fn_open (html->handle, "w");
@@ -250,87 +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);
-    }
-  else if (is_image_item (output_item) && html->chart_file_name != NULL)
+  switch (item->type)
     {
-      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, "<img src=\"%s\">", file_name);
-          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, "<img src=\"%s\" alt=\"chart: %s\">",
+                       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, "<img src=\"%s\" alt=\"chart: %s\">",
-		   file_name, title ? title : _("No description"));
-          free (file_name);
+          char *file_name = xr_write_png_image (
+            item->image, html->chart_file_name, ++html->n_charts);
+          if (file_name != NULL)
+            {
+              fprintf (html->file, "<img src=\"%s\">", file_name);
+              free (file_name);
+            }
         }
-    }
-  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, "<p>");
+
+      char *s = msg_to_string (item->message);
+      escape_string (html->file, s, " ", "<br>");
+      free (s);
+
+      fprintf (html->file, "</p>\n");
+      break;
+
+    case OUTPUT_ITEM_PAGE_BREAK:
+      break;
 
-        case TEXT_ITEM_TITLE:
+    case OUTPUT_ITEM_TABLE:
+      html_output_table (html, item);
+      break;
+
+    case OUTPUT_ITEM_TEXT:
+      {
+        char *s = text_item_get_plain_text (item);
+
+        switch (item->text.subtype)
           {
-            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_PAGE_TITLE:
+            break;
 
-        case TEXT_ITEM_SYNTAX:
-          fprintf (html->file, "<pre class=\"syntax\">");
-          escape_string (html->file, s, " ", "<br>");
-          fprintf (html->file, "</pre>\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, "<pre class=\"syntax\">");
+            escape_string (html->file, s, " ", "<br>");
+            fprintf (html->file, "</pre>\n");
+            break;
+
+          case TEXT_ITEM_LOG:
+            fprintf (html->file, "<p>");
+            escape_string (html->file, s, " ", "<br>");
+            fprintf (html->file, "</p>\n");
+            break;
+          }
 
-        case TEXT_ITEM_LOG:
-          fprintf (html->file, "<p>");
-          escape_string (html->file, s, " ", "<br>");
-          fprintf (html->file, "</p>\n");
-          break;
-        }
-    }
-  else if (is_message_item (output_item))
-    {
-      const struct message_item *message_item = to_message_item (output_item);
-      char *s = msg_to_string (message_item_get_msg (message_item));
-      fprintf (html->file, "<p>");
-      escape_string (html->file, s, " ", "<br>");
-      fprintf (html->file, "</p>\n");
-      free (s);
+        free (s);
+      }
+      break;
     }
 }
 
+static void
+html_submit (struct output_driver *driver, const struct output_item *item)
+{
+  html_submit__ (driver, item, 1);
+}
+
 /* Write TEXT to file F, escaping characters as necessary for HTML.  Spaces are
    replaced by SPACE, which should be " " or "&nbsp;" New-lines are replaced by
    NEWLINE, which might be "<BR>" or "\n" or something else appropriate. */
@@ -571,32 +585,35 @@ html_put_table_cell (struct html_driver *html, const struct pivot_table *pt,
   escape_string (html->file, s, " ", "<br>");
   ds_destroy (&body);
 
-  if (cell->value->n_subscripts)
+  const struct pivot_value_ex *ex = pivot_value_ex (cell->value);
+  if (ex->n_subscripts)
     {
       fputs ("<sub>", html->file);
-      for (size_t i = 0; i < cell->value->n_subscripts; i++)
+      for (size_t i = 0; i < ex->n_subscripts; i++)
         {
           if (i)
             putc (',', html->file);
-          escape_string (html->file, cell->value->subscripts[i],
-                         "&nbsp;", "<br>");
+          escape_string (html->file, ex->subscripts[i], "&nbsp;", "<br>");
         }
       fputs ("</sub>", html->file);
     }
-  if (cell->value->n_footnotes > 0)
+  if (ex->n_footnotes > 0)
     {
       fputs ("<sup>", html->file);
-      for (size_t i = 0; i < cell->value->n_footnotes; i++)
+      size_t n_footnotes = 0;
+      for (size_t i = 0; i < ex->n_footnotes; i++)
         {
-          if (i > 0)
-            putc (',', html->file);
-
-          size_t idx = cell->value->footnote_indexes[i];
-          const struct pivot_footnote *f = pt->footnotes[idx];
+          const struct pivot_footnote *f
+            = pt->footnotes[ex->footnote_indexes[i]];
+          if (f->show)
+            {
+              if (n_footnotes++ > 0)
+                putc (',', html->file);
 
-          char *marker = pivot_footnote_marker_string (f, pt);
-          escape_string (html->file, marker, " ", "<br>");
-          free (marker);
+              char *marker = pivot_footnote_marker_string (f, pt);
+              escape_string (html->file, marker, " ", "<br>");
+              free (marker);
+            }
         }
       fputs ("</sup>", html->file);
     }
@@ -711,11 +728,11 @@ html_output_table_layer (struct html_driver *html, const struct pivot_table *pt,
 }
 
 static void
-html_output_table (struct html_driver *html, const struct table_item *item)
+html_output_table (struct html_driver *html, const struct output_item *item)
 {
   size_t *layer_indexes;
-  PIVOT_OUTPUT_FOR_EACH_LAYER (layer_indexes, item->pt, true)
-    html_output_table_layer (html, item->pt, layer_indexes);
+  PIVOT_OUTPUT_FOR_EACH_LAYER (layer_indexes, item->table, true)
+    html_output_table_layer (html, item->table, layer_indexes);
 }
 
 struct output_driver_factory html_driver_factory =
@@ -723,8 +740,8 @@ struct output_driver_factory html_driver_factory =
 
 static const struct output_driver_class html_driver_class =
   {
-    "html",
-    html_destroy,
-    html_submit,
-    NULL,
+    .name = "html",
+    .destroy = html_destroy,
+    .submit = html_submit,
+    .handles_groups = true,
   };