fputs ("<TBODY VALIGN=\"TOP\">\n", html->file);
const struct table_item_text *title = table_item_get_title (item);
- if (title)
+ const struct table_item_text *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_text (html, layers);
fputs ("</CAPTION>\n", html->file);
}
/* 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");
}