output: Move text_item and group_item usage closer to the SPV model.

[pspp] / src / output / html.c

diff --git a/src/output/html.c b/src/output/html.c
index 05fc08eb62f55dbfe407140a634d82fd4c8748f7..1027dea501037e5e74655ecb0a4d76b7c2357280 100644 (file)
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -50,8 +50,8 @@ struct html_driver
   {
     struct output_driver driver;
 #ifdef HAVE_CAIRO
-    struct xr_color fg;
-    struct xr_color bg;
+    struct cell_color fg;
+    struct cell_color bg;
 #endif
     struct file_handle *handle;
     char *chart_file_name;
@@ -279,18 +279,10 @@ html_submit (struct output_driver *driver,
           fprintf (html->file, "</PRE>\n");
           break;
 
-        case TEXT_ITEM_PARAGRAPH:
-          print_title_tag (html->file, "P", s);
-          break;
-
         case TEXT_ITEM_LOG:
           print_title_tag (html->file, "PRE", s); /* should be <P><TT> */
           break;
 
-        case TEXT_ITEM_BLANK_LINE:
-          fputs ("<BR>", html->file);
-          break;
-
         case TEXT_ITEM_EJECT_PAGE:
           /* Nothing to do. */
           break;
@@ -561,8 +553,6 @@ html_output_table (struct html_driver *html, const struct table_item *item)
 
           /* Output cell contents. */
           const char *s = cell.text;
-          if (cell.options & TAB_EMPH)
-            fputs ("<EM>", html->file);
           if (cell.options & TAB_FIX)
             {
               fputs ("<TT>", html->file);
@@ -574,8 +564,6 @@ html_output_table (struct html_driver *html, const struct table_item *item)
               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);