X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=1c6662793fc3fafd5c40f83d3a668f700e32bc8d;hb=3fa740d165a0c2ef7c03b11633f65c421f07f0a2;hp=9c70a4515899dcda1570cecbdd8a297e00698ee8;hpb=7b3ea5147198695be27b2646548c11ac92d63129;p=pspp

diff --git a/src/output/csv.c b/src/output/csv.c
index 9c70a45158..1c6662793f 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -227,7 +227,8 @@ csv_submit (struct output_driver *driver,
 
               if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0])
                 csv_output_field (csv, "");
-              else if (!(cell.options & TAB_MARKUP) && !cell.n_footnotes)
+              else if (!(cell.options & TAB_MARKUP) && !cell.n_footnotes
+                       && !cell.n_subscripts && !cell.superscript)
                 csv_output_field (csv, cell.text);
               else
                 {
@@ -242,12 +243,16 @@ csv_submit (struct output_driver *driver,
                   else
                     ds_put_cstr (&s, cell.text);
 
+                  if (cell.n_subscripts)
+                    for (size_t i = 0; i < cell.n_subscripts; i++)
+                      ds_put_format (&s, "%c%s",
+                                     i ? ',' : '_', cell.subscripts[i]);
+                  if (cell.superscript)
+                    ds_put_format (&s, "^%s", cell.superscript);
                   csv_format_footnotes (cell.footnotes, cell.n_footnotes, &s);
                   csv_output_field (csv, ds_cstr (&s));
                   ds_destroy (&s);
                 }
-
-              table_cell_free (&cell);
             }
           putc ('\n', csv->file);
         }