table: Make table cells have exactly one piece of content again.

[pspp] / src / output / html.c

diff --git a/src/output/html.c b/src/output/html.c
index 84843cbd64eebb17d37aab86f21bce0d0eb55cfa..959519e46e1b4e2a961dfbe9236b98a618b0c4fa 100644 (file)
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -40,7 +40,8 @@
 #include "output/table-item.h"
 #include "output/text-item.h"
 
-#include "xalloc.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -199,7 +200,7 @@ print_title_tag (FILE *file, const char *name, const char *content)
 {
   if (content != NULL)
     {
-      fprintf (file, "<%s>", name);
+       fprintf (file, "<%s>", name);
       escape_string (file, content, strlen (content), " ", " - ");
       fprintf (file, "</%s>\n", name);
     }
@@ -264,8 +265,12 @@ html_submit (struct output_driver *driver,
         case TEXT_ITEM_PAGE_TITLE:
           break;
 
-        case TEXT_ITEM_SUBHEAD:
-          print_title_tag (html->file, "H4", s);
+        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:
@@ -278,7 +283,7 @@ html_submit (struct output_driver *driver,
           print_title_tag (html->file, "P", s);
           break;
 
-        case TEXT_ITEM_MONOSPACE:
+        case TEXT_ITEM_LOG:
           print_title_tag (html->file, "PRE", s); /* should be <P><TT> */
           break;
 
@@ -289,11 +294,6 @@ html_submit (struct output_driver *driver,
         case TEXT_ITEM_EJECT_PAGE:
           /* Nothing to do. */
           break;
-
-        case TEXT_ITEM_COMMENT:
-        case TEXT_ITEM_ECHO:
-          /* We print out syntax anyway, so nothing to do here either. */
-          break;
         }
     }
   else if (is_message_item (output_item))
@@ -483,7 +483,6 @@ html_output_table (struct html_driver *html, const struct table_item *item)
       fputs ("  <TR>\n", html->file);
       for (x = 0; x < table_nc (t); )
         {
-          const struct cell_contents *c;
           struct table_cell cell;
           const char *tag;
           bool is_header;
@@ -502,16 +501,12 @@ html_output_table (struct html_driver *html, const struct table_item *item)
           tag = is_header ? "TH" : "TD";
           fprintf (html->file, "    <%s", tag);
 
-          int halign = (cell.n_contents > 0
-                        ? cell.contents[0].options & TAB_HALIGN
-                        : TAB_LEFT);
+          int halign = cell.options & TAB_HALIGN;
           if (halign != TAB_LEFT)
             fprintf (html->file, " ALIGN=\"%s\"",
                      halign == TAB_RIGHT ? "RIGHT" : "CENTER");
 
-          int valign = (cell.n_contents > 0
-                        ? cell.contents[0].options & TAB_VALIGN
-                        : TAB_LEFT);
+          int valign = cell.options & TAB_VALIGN;
           if (valign != TAB_TOP)
             fprintf (html->file, " ALIGN=\"%s\"",
                      valign == TAB_BOTTOM ? "BOTTOM" : "MIDDLE");
@@ -557,28 +552,24 @@ html_output_table (struct html_driver *html, const struct table_item *item)
           putc ('>', html->file);
 
           /* Output cell contents. */
-          for (c = cell.contents; c < &cell.contents[cell.n_contents]; c++)
+          const char *s = cell.text;
+          if (cell.options & TAB_EMPH)
+            fputs ("<EM>", html->file);
+          if (cell.options & TAB_FIX)
             {
-              const char *s = c->text;
-
-              if (c->options & TAB_EMPH)
-                fputs ("<EM>", html->file);
-              if (c->options & TAB_FIX)
-                {
-                  fputs ("<TT>", html->file);
-                  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), " ", "<BR>");
-                }
-              if (c->options & TAB_EMPH)
-                fputs ("</EM>", html->file);
-
-              html_put_footnote_markers (html, c->footnotes, c->n_footnotes);
+              fputs ("<TT>", html->file);
+              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), " ", "<BR>");
+            }
+          if (cell.options & TAB_EMPH)
+            fputs ("</EM>", html->file);
+
+          html_put_footnote_markers (html, cell.footnotes, cell.n_footnotes);
 
           /* Output </TH> or </TD>. */
           fprintf (html->file, "</%s>\n", tag);