render: Render table_items instead of tables.

[pspp] / src / output / html.c

diff --git a/src/output/html.c b/src/output/html.c
index 8d20a61b3796c8837412018c436f80be77958d9e..82478d189bdd8dd44f87e87023287532b2c6e515 100644 (file)
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -64,11 +64,10 @@ struct html_driver
 
 static const struct output_driver_class html_driver_class;
 
-static void html_output_table (struct html_driver *, const struct table *,
-                               const char *caption);
+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);
 
@@ -201,7 +200,7 @@ print_title_tag (FILE *file, const char *name, const char *content)
   if (content != NULL)
     {
       fprintf (file, "<%s>", name);
-      escape_string (file, content, strlen (content), " ");
+      escape_string (file, content, strlen (content), " ", " - ");
       fprintf (file, "</%s>\n", name);
     }
 }
@@ -236,8 +235,7 @@ html_submit (struct output_driver *driver,
   if (is_table_item (output_item))
     {
       struct table_item *table_item = to_table_item (output_item);
-      html_output_table (html, table_item_get_table (table_item),
-                         table_item_get_caption (table_item));
+      html_output_table (html, table_item);
     }
 #ifdef HAVE_CAIRO
   else if (is_chart_item (output_item) && html->chart_file_name != NULL)
@@ -276,7 +274,7 @@ html_submit (struct output_driver *driver,
 
         case TEXT_ITEM_COMMAND_OPEN:
           fprintf (html->file, "<DIV class=\"");
-          escape_string (html->file, s, strlen (s), "_");
+          escape_string (html->file, s, strlen (s), "_", "<BR>");
           fprintf (html->file, "\">");
           print_title_tag (html->file, "H3", s);
           break;
@@ -291,7 +289,7 @@ html_submit (struct output_driver *driver,
 
         case TEXT_ITEM_SYNTAX:
           fprintf (html->file, "<PRE class=\"syntax\">");
-          escape_string (html->file, s, strlen (s), " ");
+          escape_string (html->file, s, strlen (s), " ", "<BR>");
           fprintf (html->file, "</PRE>\n");
           break;
 
@@ -327,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 "&nbsp;". */
+/* Write LENGTH characters in 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. */
 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 ("&amp;", file);
           break;
@@ -372,9 +374,10 @@ put_border (FILE *file, int n_borders, int style, const char *border_name)
 }
 
 static void
-html_output_table (struct html_driver *html,
-                   const struct table *t, const char *caption)
+html_output_table (struct html_driver *html, const struct table_item *item)
 {
+  const struct table *t = table_item_get_table (item);
+  const char *caption = table_item_get_caption (item);
   int x, y;
 
   fputs ("<TABLE><TBODY VALIGN=\"TOP\">\n", html->file);
@@ -382,7 +385,7 @@ html_output_table (struct html_driver *html,
   if (caption != NULL)
     {
       fputs ("  <CAPTION>", html->file);
-      escape_string (html->file, caption, strlen (caption), " ");
+      escape_string (html->file, caption, strlen (caption), " ", "<BR>");
       fputs ("</CAPTION>\n", html->file);
     }
 
@@ -470,19 +473,19 @@ html_output_table (struct html_driver *html,
                   if (c->options & TAB_FIX)
                     {
                       fputs ("<TT>", html->file);
-                      escape_string (html->file, s, strlen (s), "&nbsp;");
+                      escape_string (html->file, s, strlen (s), "&nbsp;", "<BR>");
                       fputs ("</TT>", html->file);
                     }
                   else
                     {
                       s += strspn (s, CC_SPACES);
-                      escape_string (html->file, s, strlen (s), " ");
+                      escape_string (html->file, s, strlen (s), " ", "<BR>");
                     }
                   if (c->options & TAB_EMPH)
                     fputs ("</EM>", html->file);
                 }
               else
-                html_output_table (html, c->table, NULL);
+                html_output_table (html, c->table);
             }
 
           /* Output </TH> or </TD>. */