char *chart_file_name;
FILE *file;
- size_t chart_cnt;
+ size_t n_charts;
bool bare;
bool css;
struct string_map *o)
{
struct output_driver *d;
- struct html_driver *html;
-
- html = xzalloc (sizeof *html);
+ struct html_driver *html = XZALLOC (struct html_driver);
d = &html->driver;
output_driver_init (&html->driver, &html_driver_class, fh_get_file_name (fh),
device_type);
html->chart_file_name = parse_chart_file_name (opt (d, o, "charts",
fh_get_file_name (fh)));
html->file = NULL;
- html->chart_cnt = 1;
+ html->n_charts = 1;
html->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF"));
html->fg = parse_color (opt (d, o, "foreground-color", "#000000000000"));
html->file = fn_open (html->handle, "w");
{
char *file_name = xr_draw_png_chart (item->chart,
html->chart_file_name,
- html->chart_cnt++,
+ html->n_charts++,
&html->fg, &html->bg);
if (file_name != NULL)
{
if (html->chart_file_name)
{
char *file_name = xr_write_png_image (
- item->image, html->chart_file_name, ++html->chart_cnt);
+ item->image, html->chart_file_name, ++html->n_charts);
if (file_name != NULL)
{
fprintf (html->file, "<img src=\"%s\">", file_name);
escape_string (html->file, s, " ", "<br>");
ds_destroy (&body);
- if (cell->value->n_subscripts)
+ const struct pivot_value_ex *ex = pivot_value_ex (cell->value);
+ if (ex->n_subscripts)
{
fputs ("<sub>", html->file);
- for (size_t i = 0; i < cell->value->n_subscripts; i++)
+ for (size_t i = 0; i < ex->n_subscripts; i++)
{
if (i)
putc (',', html->file);
- escape_string (html->file, cell->value->subscripts[i],
- " ", "<br>");
+ escape_string (html->file, ex->subscripts[i], " ", "<br>");
}
fputs ("</sub>", html->file);
}
- if (cell->value->n_footnotes > 0)
+ if (ex->n_footnotes > 0)
{
fputs ("<sup>", html->file);
size_t n_footnotes = 0;
- for (size_t i = 0; i < cell->value->n_footnotes; i++)
+ for (size_t i = 0; i < ex->n_footnotes; i++)
{
const struct pivot_footnote *f
- = pt->footnotes[cell->value->footnote_indexes[i]];
+ = pt->footnotes[ex->footnote_indexes[i]];
if (f->show)
{
if (n_footnotes++ > 0)