X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=1027dea501037e5e74655ecb0a4d76b7c2357280;hb=f967d0e36a2193c1249799f463ea9109b753f7a8;hp=05fc08eb62f55dbfe407140a634d82fd4c8748f7;hpb=a7a300e7d9963ce9a26fd87e4db922ed74111731;p=pspp diff --git a/src/output/html.c b/src/output/html.c index 05fc08eb62..1027dea501 100644 --- 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, "\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
*/
break;
- case TEXT_ITEM_BLANK_LINE:
- fputs ("
", 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 ("", html->file);
if (cell.options & TAB_FIX)
{
fputs ("", 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), " ", "
");
}
- if (cell.options & TAB_EMPH)
- fputs ("", html->file);
html_put_footnote_markers (html, cell.footnotes, cell.n_footnotes);