X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=19d1085e4178d20490b8a10cee5d030fea1245a2;hb=d3fef25674baf4f4e25502f257c680b5090535c6;hp=82478d189bdd8dd44f87e87023287532b2c6e515;hpb=f1db96caae465cb7daaf6efbe69ae17069ea1198;p=pspp

diff --git a/src/output/html.c b/src/output/html.c
index 82478d189b..19d1085e41 100644
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -378,9 +378,55 @@ html_output_table (struct html_driver *html, const struct table_item *item)
 {
   const struct table *t = table_item_get_table (item);
   const char *caption = table_item_get_caption (item);
-  int x, y;
+  int footnote_idx = 0;
+  int y;
 
-  fputs ("<TABLE><TBODY VALIGN=\"TOP\">\n", html->file);
+  fputs ("<TABLE>", html->file);
+
+  footnote_idx = 0;
+  for (y = 0; y < table_nr (t); y++)
+    {
+      int x;
+
+      for (x = 0; x < table_nc (t); )
+        {
+          const struct cell_contents *c;
+          struct table_cell cell;
+
+          table_get_cell (t, x, y, &cell);
+          if (y != cell.d[TABLE_VERT][0])
+            continue;
+
+          for (c = cell.contents; c < &cell.contents[cell.n_contents]; c++)
+            {
+              int i;
+
+              for (i = 0; i < c->n_footnotes; i++)
+                {
+                  char marker[16];
+
+                  if (!footnote_idx)
+                    fprintf (html->file, "<TFOOT><TR><TD COLSPAN=%d>",
+                             table_nc (t));
+                  else
+                    fputs ("\n<BR>", html->file);
+                  str_format_26adic (++footnote_idx, false, marker, sizeof marker);
+                  fprintf (html->file, "<SUP>%s</SUP> ", marker);
+                  escape_string (html->file, c->footnotes[i],
+                                 strlen (c->footnotes[i]), " ", "<BR>");
+                }
+            }
+          x = cell.d[TABLE_HORZ][1];
+          table_cell_free (&cell);
+        }
+    }
+  if (footnote_idx)
+    {
+      fputs ("</TD></TR></TFOOT>\n", html->file);
+      footnote_idx = 0;
+    }
+
+  fputs ("<TBODY VALIGN=\"TOP\">\n", html->file);
 
   if (caption != NULL)
     {
@@ -391,8 +437,10 @@ html_output_table (struct html_driver *html, const struct table_item *item)
 
   for (y = 0; y < table_nr (t); y++)
     {
+      int x;
+
       fputs ("  <TR>\n", html->file);
-      for (x = 0; x < table_nc (t); x++)
+      for (x = 0; x < table_nc (t); )
         {
           const struct cell_contents *c;
           struct table_cell cell;
@@ -467,6 +515,7 @@ html_output_table (struct html_driver *html, const struct table_item *item)
               if (c->text)
                 {
                   const char *s = c->text;
+                  int i;
 
                   if (c->options & TAB_EMPH)
                     fputs ("<EM>", html->file);
@@ -483,6 +532,22 @@ html_output_table (struct html_driver *html, const struct table_item *item)
                     }
                   if (c->options & TAB_EMPH)
                     fputs ("</EM>", html->file);
+
+                  if (c->n_footnotes > 0)
+                    {
+                      fputs ("<SUP>", html->file);
+                      for (i = 0; i < c->n_footnotes; i++)
+                        {
+                          char marker[16];
+
+                          if (i > 0)
+                            putc (',', html->file);
+                          str_format_26adic (++footnote_idx, false,
+                                             marker, sizeof marker);
+                          fputs (marker, html->file);
+                        }
+                      fputs ("</SUP>", html->file);
+                    }
                 }
               else
                 html_output_table (html, c->table);
@@ -491,6 +556,7 @@ html_output_table (struct html_driver *html, const struct table_item *item)
           /* Output </TH> or </TD>. */
           fprintf (html->file, "</%s>\n", tag);
 
+          x = cell.d[TABLE_HORZ][1];
           table_cell_free (&cell);
         }
       fputs ("  </TR>\n", html->file);