\n", html->file);
- fprintf (html->file, "\n", t->n[H]);
- *tfoot = true;
- }
- else
- fputs ("\n
", html->file);
-}
-
-static void
-html_put_footnote_markers (struct html_driver *html,
- 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 (i > 0)
- putc (',', html->file);
- escape_string (html->file, f->marker, " ", "
");
- }
- fputs ("", html->file);
- }
-}
-
-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
- {
- s += strspn (s, CC_SPACES);
- escape_string (html->file, s, " ", "
");
- }
-
- if (cell->n_subscripts)
- {
- fputs ("", html->file);
- for (size_t i = 0; i < cell->n_subscripts; i++)
- {
- if (i)
- putc (',', html->file);
- escape_string (html->file, cell->subscripts[i],
- " ", "
");
- }
- fputs ("", html->file);
- }
- 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 (i)
- fputs ("
\n", 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);
- }
-}
-
-static void
-html_put_table_cell (struct html_driver *html, const struct table *t,
- const struct table_cell *cell, const char *tag,
- bool border)
+html_put_table_cell (struct html_driver *html, const struct pivot_table *pt,
+ const struct table_cell *cell,
+ const char *tag, const struct table *t)
{
fprintf (html->file, "<%s", tag);
struct css_style style;
style_start (&style, html->file);
- enum table_halign halign = table_halign_interpret (
- cell->style->cell_style.halign, cell->options & TAB_NUMERIC);
+
+ struct string body = DS_EMPTY_INITIALIZER;
+ bool numeric = pivot_value_format_body (cell->value, pt, &body);
+
+ enum table_halign halign = table_halign_interpret (cell->cell_style->halign,
+ numeric);
switch (halign)
{
@@ -584,14 +519,14 @@ html_put_table_cell (struct html_driver *html, const struct table *t,
if (cell->options & TAB_ROTATE)
put_style (&style, "writing-mode", "sideways-lr");
- if (cell->style->cell_style.valign != TABLE_VALIGN_TOP)
+ if (cell->cell_style->valign != TABLE_VALIGN_TOP)
{
put_style (&style, "vertical-align",
- (cell->style->cell_style.valign == TABLE_VALIGN_BOTTOM
+ (cell->cell_style->valign == TABLE_VALIGN_BOTTOM
? "bottom" : "middle"));
}
- const struct font_style *fs = &cell->style->font_style;
+ 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,
@@ -623,7 +558,7 @@ html_put_table_cell (struct html_driver *html, const struct table *t,
put_style (&style, "font-size", buf);
}
- if (border)
+ if (t && html->borders)
{
put_border (t, cell, &style, V, 0, 0, "top");
put_border (t, cell, &style, H, 0, 0, "left");
@@ -645,90 +580,159 @@ html_put_table_cell (struct html_driver *html, const struct table *t,
putc ('>', html->file);
- html_put_table_cell_text (html, cell);
+ const char *s = ds_cstr (&body);
+ s += strspn (s, CC_SPACES);
+ escape_string (html->file, s, " ", "
");
+ ds_destroy (&body);
+
+ const struct pivot_value_ex *ex = pivot_value_ex (cell->value);
+ if (ex->n_subscripts)
+ {
+ fputs ("", html->file);
+ for (size_t i = 0; i < ex->n_subscripts; i++)
+ {
+ if (i)
+ putc (',', html->file);
+ escape_string (html->file, ex->subscripts[i], " ", "
");
+ }
+ fputs ("", html->file);
+ }
+ if (ex->n_footnotes > 0)
+ {
+ fputs ("", html->file);
+ size_t n_footnotes = 0;
+ for (size_t i = 0; i < ex->n_footnotes; i++)
+ {
+ const struct pivot_footnote *f
+ = pt->footnotes[ex->footnote_indexes[i]];
+ if (f->show)
+ {
+ if (n_footnotes++ > 0)
+ putc (',', html->file);
+
+ char *marker = pivot_footnote_marker_string (f, 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;
+ 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_cell *caption = table_item_get_caption (item);
- if (caption)
+ if (title)
{
- put_tfoot (html, t, &tfoot);
- html_put_table_cell (html, t, caption, "span", false);
+ struct table_cell cell;
+ table_get_cell (title, 0, 0, &cell);
+ html_put_table_cell (html, pt, &cell, "caption", NULL);
}
- struct footnote **f;
- size_t n_footnotes = table_collect_footnotes (item, &f);
- for (size_t i = 0; i < n_footnotes; i++)
- {
- put_tfoot (html, t, &tfoot);
- escape_tag (html->file, "sup", f[i]->marker, " ", "
");
- escape_string (html->file, f[i]->content, " ", "
");
- }
- free (f);
- if (tfoot)
+ if (layers)
{
- fputs ("\n", html->file);
- fputs ("
\n", html->file);
- fputs ("