#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)
{
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;
{
if (content != NULL)
{
- fprintf (file, "<%s>", name);
+ fprintf (file, "<%s>", name);
escape_string (file, content, strlen (content), " ", " - ");
fprintf (file, "</%s>\n", name);
}
switch (text_item_get_type (text_item))
{
- case TEXT_ITEM_TITLE:
- print_title_tag (html->file, "H1", s);
- break;
-
- case TEXT_ITEM_SUBTITLE:
- print_title_tag (html->file, "H2", s);
- break;
-
- case TEXT_ITEM_COMMAND_OPEN:
- fprintf (html->file, "<DIV class=\"");
- escape_string (html->file, s, strlen (s), "_", "<BR>");
- fprintf (html->file, "\">");
- print_title_tag (html->file, "H3", s);
- break;
-
- case TEXT_ITEM_COMMAND_CLOSE:
- fprintf (html->file, "</DIV>\n");
+ 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:
fprintf (html->file, "</PRE>\n");
break;
- case TEXT_ITEM_PARAGRAPH:
- 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;
- case TEXT_ITEM_BLANK_LINE:
- fputs ("<BR>", html->file);
- break;
-
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))
{
const struct message_item *message_item = to_message_item (output_item);
- const struct msg *msg = message_item_get_msg (message_item);
- char *s = msg_to_string (msg, message_item->command_name);
+ char *s = msg_to_string (message_item_get_msg (message_item));
print_title_tag (html->file, "P", s);
free (s);
}
html_put_footnote_markers (html, text->footnotes, text->n_footnotes);
}
+static void
+html_put_table_item_layers (struct html_driver *html,
+ const struct table_item_layers *layers)
+{
+ for (size_t i = 0; i < layers->n_layers; i++)
+ {
+ if (i)
+ fputs ("<BR>\n", html->file);
+
+ const struct table_item_layer *layer = &layers->layers[i];
+ escape_string (html->file, layer->content, strlen (layer->content),
+ " ", "<BR>");
+ html_put_footnote_markers (html, layer->footnotes, layer->n_footnotes);
+ }
+}
+
static void
html_output_table (struct html_driver *html, const struct table_item *item)
{
size_t n_footnotes = table_collect_footnotes (item, &f);
for (size_t i = 0; i < n_footnotes; i++)
- if (f[i])
- {
- put_tfoot (html, t, &tfoot);
- fputs ("<SUP>", html->file);
- escape_string (html->file, f[i]->marker, strlen (f[i]->marker),
- " ", "<BR>");
- fputs ("</SUP> ", html->file);
- escape_string (html->file, f[i]->content, strlen (f[i]->content),
- " ", "<BR>");
- }
+ {
+ put_tfoot (html, t, &tfoot);
+ fputs ("<SUP>", html->file);
+ escape_string (html->file, f[i]->marker, strlen (f[i]->marker),
+ " ", "<BR>");
+ fputs ("</SUP> ", html->file);
+ escape_string (html->file, f[i]->content, strlen (f[i]->content),
+ " ", "<BR>");
+ }
free (f);
if (tfoot)
fputs ("</TD></TR></TFOOT>\n", html->file);
fputs ("<TBODY VALIGN=\"TOP\">\n", html->file);
const struct table_item_text *title = table_item_get_title (item);
- if (title)
+ const struct table_item_layers *layers = table_item_get_layers (item);
+ if (title || layers)
{
fputs (" <CAPTION>", html->file);
- html_put_table_item_text (html, title);
+ if (title)
+ html_put_table_item_text (html, title);
+ if (title && layers)
+ fputs ("<BR>\n", html->file);
+ if (layers)
+ html_put_table_item_layers (html, layers);
fputs ("</CAPTION>\n", html->file);
}
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;
tag = is_header ? "TH" : "TD";
fprintf (html->file, " <%s", tag);
- int halign = (cell.n_contents > 0
- ? cell.contents[0].options & TAB_HALIGN
- : TAB_LEFT);
- if (halign != TAB_LEFT)
- fprintf (html->file, " ALIGN=\"%s\"",
- halign == TAB_RIGHT ? "RIGHT" : "CENTER");
+ enum table_halign halign = table_halign_interpret (
+ cell.style->cell_style.halign, cell.options & TAB_NUMERIC);
+ if (halign != TABLE_HALIGN_LEFT)
+ {
+ fprintf (html->file, " ALIGN=\"%s\"",
+ (halign == TABLE_HALIGN_RIGHT ? "RIGHT"
+ : halign == TABLE_HALIGN_CENTER ? "CENTER"
+ : "CHAR"));
+ if (cell.style->cell_style.decimal_char)
+ fprintf (html->file, " CHAR=\"%c\"",
+ cell.style->cell_style.decimal_char);
+ }
- int valign = (cell.n_contents > 0
- ? cell.contents[0].options & TAB_VALIGN
- : TAB_LEFT);
- if (valign != TAB_TOP)
+ if (cell.style->cell_style.valign != TABLE_VALIGN_TOP)
fprintf (html->file, " ALIGN=\"%s\"",
- valign == TAB_BOTTOM ? "BOTTOM" : "MIDDLE");
+ (cell.style->cell_style.valign == TABLE_VALIGN_BOTTOM
+ ? "BOTTOM" : "MIDDLE"));
colspan = table_cell_colspan (&cell);
if (colspan > 1)
/* Cell borders. */
int n_borders = 0;
- top = table_get_rule (t, TABLE_VERT, x, y);
+ struct cell_color color;
+ top = table_get_rule (t, TABLE_VERT, x, y, &color);
put_border (html->file, &n_borders, top, "top");
if (y + rowspan == table_nr (t))
{
- bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan);
+ bottom = table_get_rule (t, TABLE_VERT, x, y + rowspan,
+ &color);
put_border (html->file, &n_borders, bottom, "bottom");
}
- left = table_get_rule (t, TABLE_HORZ, x, y);
+ left = table_get_rule (t, TABLE_HORZ, x, y, &color);
put_border (html->file, &n_borders, left, "left");
if (x + colspan == table_nc (t))
{
- right = table_get_rule (t, TABLE_HORZ, x + colspan, y);
+ right = table_get_rule (t, TABLE_HORZ, x + colspan, y,
+ &color);
put_border (html->file, &n_borders, right, "right");
}
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_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), " ", "<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), " ", "<BR>");
+ fputs ("</TT>", html->file);
}
+ else
+ {
+ s += strspn (s, CC_SPACES);
+ escape_string (html->file, s, strlen (s), " ", "<BR>");
+ }
+
+ html_put_footnote_markers (html, cell.footnotes, cell.n_footnotes);
/* Output </TH> or </TD>. */
fprintf (html->file, "</%s>\n", tag);
projects / pspp / blobdiff