treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[pspp] / src / output / html.c

diff --git a/src/output/html.c b/src/output/html.c
index e3483b4ebc9318a042cd7baaf9a207b1b6285c62..a2e63f943888169a1e30458f6b7d0b100bc6e102 100644 (file)
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -61,7 +61,7 @@ struct html_driver
     char *chart_file_name;
 
     FILE *file;
-    size_t chart_cnt;
+    size_t n_charts;
 
     bool bare;
     bool css;
@@ -180,9 +180,7 @@ html_create (struct file_handle *fh, enum settings_output_devices device_type,
              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);
@@ -194,7 +192,7 @@ html_create (struct file_handle *fh, enum settings_output_devices 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");
@@ -259,7 +257,7 @@ html_submit__ (struct output_driver *driver, const struct output_item *item,
         {
           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)
             {
@@ -280,7 +278,7 @@ html_submit__ (struct output_driver *driver, const struct output_item *item,
       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);
@@ -302,9 +300,6 @@ html_submit__ (struct output_driver *driver, const struct output_item *item,
     case OUTPUT_ITEM_PAGE_BREAK:
       break;
 
-    case OUTPUT_ITEM_PAGE_SETUP:
-      break;
-
     case OUTPUT_ITEM_TABLE:
       html_output_table (html, item);
       break;
@@ -590,26 +585,26 @@ html_put_table_cell (struct html_driver *html, const struct pivot_table *pt,
   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],
-                         "&nbsp;", "<br>");
+          escape_string (html->file, ex->subscripts[i], "&nbsp;", "<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)