output: Remove support for nested tables.

[pspp] / src / output / html.c

diff --git a/src/output/html.c b/src/output/html.c
index 38b89719a443095bf3456437a05b81bb6f6c450d..6dc2ffe7379b00a5018946ace0365af5fec1f32e 100644 (file)
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -527,45 +527,40 @@ html_output_table (struct html_driver *html, const struct table_item *item)
           /* Output cell contents. */
           for (c = cell.contents; c < &cell.contents[cell.n_contents]; c++)
             {
-              if (c->text)
+              const char *s = c->text;
+              int i;
+
+              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
                 {
-                  const char *s = c->text;
-                  int i;
+                  s += strspn (s, CC_SPACES);
+                  escape_string (html->file, s, strlen (s), " ", "<BR>");
+                }
+              if (c->options & TAB_EMPH)
+                fputs ("</EM>", html->file);
 
-                  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
+              if (c->n_footnotes > 0)
+                {
+                  fputs ("<SUP>", html->file);
+                  for (i = 0; i < c->n_footnotes; i++)
                     {
-                      s += strspn (s, CC_SPACES);
-                      escape_string (html->file, s, strlen (s), " ", "<BR>");
-                    }
-                  if (c->options & TAB_EMPH)
-                    fputs ("</EM>", html->file);
+                      char marker[16];
 
-                  if (c->n_footnotes > 0)
-                    {
-                      fputs ("<SUP>", html->file);
-                      for (i = 0; i < c->n_footnotes; i++)
-                        {
-                          char marker[16];
-
-                          if (i > 0)
-                            putc (',', html->file);
-                          str_format_26adic (++footnote_idx, false,
-                                             marker, sizeof marker);
-                          fputs (marker, html->file);
-                        }
-                      fputs ("</SUP>", html->file);
+                      if (i > 0)
+                        putc (',', html->file);
+                      str_format_26adic (++footnote_idx, false,
+                                         marker, sizeof marker);
+                      fputs (marker, html->file);
                     }
+                  fputs ("</SUP>", html->file);
                 }
-              else
-                html_output_table (html, c->table);
             }
 
           /* Output </TH> or </TD>. */