\n", html->file);
- fprintf (html->file, "\n", t->n[H]);
- *tfoot = true;
+ case TABLE_HALIGN_RIGHT:
+ put_style (&style, "text-align", "right");
+ break;
+ case TABLE_HALIGN_CENTER:
+ put_style (&style, "text-align", "center");
+ break;
+ default:
+ /* Do nothing */
+ break;
}
- else
- fputs ("\n
", html->file);
-}
-static void
-html_put_footnote_markers (struct html_driver *html,
- const struct footnote **footnotes,
- size_t n_footnotes)
-{
- if (n_footnotes > 0)
- {
- fputs ("", html->file);
- for (size_t i = 0; i < n_footnotes; i++)
- {
- const struct footnote *f = footnotes[i];
+ if (cell->options & TAB_ROTATE)
+ put_style (&style, "writing-mode", "sideways-lr");
- if (i > 0)
- putc (',', html->file);
- escape_string (html->file, f->marker, " ", "
");
- }
- fputs ("", html->file);
+ if (cell->cell_style->valign != TABLE_VALIGN_TOP)
+ {
+ put_style (&style, "vertical-align",
+ (cell->cell_style->valign == TABLE_VALIGN_BOTTOM
+ ? "bottom" : "middle"));
}
-}
-static void
-html_put_table_item_text (struct html_driver *html,
- const struct table_item_text *text)
-{
- escape_string (html->file, text->content, " ", "
");
- html_put_footnote_markers (html, text->footnotes, text->n_footnotes);
-}
+ const struct font_style *fs = cell->font_style;
+ char bgcolor[32];
+ if (format_color (fs->bg[cell->d[V][0] % 2],
+ (struct cell_color) CELL_COLOR_WHITE,
+ bgcolor, sizeof bgcolor))
+ put_style (&style, "background", bgcolor);
-static void
-html_put_table_cell_text (struct html_driver *html,
- const struct table_cell *cell)
-{
- const char *s = cell->text;
- if (cell->options & TAB_FIX)
- escape_tag (html->file, "tt", s, " ", "
");
- else
+ char fgcolor[32];
+ if (format_color (fs->fg[cell->d[V][0] % 2],
+ (struct cell_color) CELL_COLOR_BLACK,
+ fgcolor, sizeof fgcolor))
+ put_style (&style, "color", fgcolor);
+
+ if (fs->typeface)
{
- s += strspn (s, CC_SPACES);
- escape_string (html->file, s, " ", "
");
+ put_style (&style, "font-family", "\"");
+ escape_string (html->file, fs->typeface, " ", "\n");
+ putc ('"', html->file);
+ }
+ if (fs->bold)
+ put_style (&style, "font-weight", "bold");
+ if (fs->italic)
+ put_style (&style, "font-style", "italic");
+ if (fs->underline)
+ put_style (&style, "text-decoration", "underline");
+ if (fs->size)
+ {
+ char buf[32];
+ snprintf (buf, sizeof buf, "%dpt", fs->size);
+ put_style (&style, "font-size", buf);
}
- if (cell->n_subscripts)
+ if (t && html->borders)
+ {
+ put_border (t, cell, &style, V, 0, 0, "top");
+ put_border (t, cell, &style, H, 0, 0, "left");
+
+ if (cell->d[V][1] == t->n[V])
+ put_border (t, cell, &style, V, 0, 1, "bottom");
+ if (cell->d[H][1] == t->n[H])
+ put_border (t, cell, &style, H, 1, 0, "right");
+ }
+ style_end (&style);
+
+ int colspan = table_cell_colspan (cell);
+ if (colspan > 1)
+ fprintf (html->file, " colspan=\"%d\"", colspan);
+
+ int rowspan = table_cell_rowspan (cell);
+ if (rowspan > 1)
+ fprintf (html->file, " rowspan=\"%d\"", rowspan);
+
+ putc ('>', html->file);
+
+ const char *s = ds_cstr (&body);
+ s += strspn (s, CC_SPACES);
+ escape_string (html->file, s, " ", "
");
+ ds_destroy (&body);
+
+ if (cell->value->n_subscripts)
{
fputs ("", html->file);
- for (size_t i = 0; i < cell->n_subscripts; i++)
+ for (size_t i = 0; i < cell->value->n_subscripts; i++)
{
if (i)
putc (',', html->file);
- escape_string (html->file, cell->subscripts[i],
+ escape_string (html->file, cell->value->subscripts[i],
" ", "
");
}
fputs ("", html->file);
}
- if (cell->superscript)
- escape_tag (html->file, "sup", cell->superscript, " ", "
");
- html_put_footnote_markers (html, cell->footnotes, cell->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 (cell->value->n_footnotes > 0)
{
- if (i)
- fputs ("
\n", html->file);
+ fputs ("", html->file);
+ for (size_t i = 0; i < cell->value->n_footnotes; i++)
+ {
+ if (i > 0)
+ putc (',', html->file);
- const struct table_item_layer *layer = &layers->layers[i];
- escape_string (html->file, layer->content, " ", "
");
- html_put_footnote_markers (html, layer->footnotes, layer->n_footnotes);
+ size_t idx = cell->value->footnote_indexes[i];
+ const struct pivot_footnote *f = pt->footnotes[idx];
+ char *marker = pivot_value_to_string (f->marker, pt);
+ escape_string (html->file, marker, " ", "
");
+ free (marker);
+ }
+ fputs ("", html->file);
}
+
+ /* output or | . */
+ fprintf (html->file, "\n", tag);
}
static void
-html_output_table (struct html_driver *html, const struct table_item *item)
+html_output_table_layer (struct html_driver *html, const struct pivot_table *pt,
+ const size_t *layer_indexes)
{
- const struct table *t = table_item_get_table (item);
- bool tfoot = false;
- int y;
+ struct table *title, *layers, *body, *caption, *footnotes;
+ pivot_output (pt, layer_indexes, true, &title, &layers, &body,
+ &caption, &footnotes, NULL, NULL);
fputs ("file);
- if (item->notes)
+ if (pt->notes)
{
fputs (" title=\"", html->file);
- escape_string (html->file, item->notes, " ", "\n");
+ escape_string (html->file, pt->notes, " ", "\n");
putc ('"', html->file);
}
fputs (">\n", html->file);
- const struct table_item_text *caption = table_item_get_caption (item);
- if (caption)
+ if (title)
{
- put_tfoot (html, t, &tfoot);
- html_put_table_item_text (html, caption);
+ struct table_cell cell;
+ table_get_cell (title, 0, 0, &cell);
+ html_put_table_cell (html, pt, &cell, "caption", NULL);
}
- const struct footnote **f;
- size_t n_footnotes = table_collect_footnotes (item, &f);
- for (size_t i = 0; i < n_footnotes; i++)
+ if (layers)
{
- put_tfoot (html, t, &tfoot);
- escape_tag (html->file, "sup", f[i]->marker, " ", "
");
- escape_string (html->file, f[i]->content, " ", "
");
- }
- free (f);
- if (tfoot)
- {
- fputs ("\n", html->file);
- fputs ("
\n", html->file);
- fputs ("