X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=04939222410c9e914ceacd15cb02d3f761f3d523;hb=e91782a2d25dec932c93b7a57bd03d836614ba43;hp=17c26a062605f96523b96e9cb17ed5ca893a0f0b;hpb=dbe1d88697fe0b37bc1cc5b0bcbacc2d3f26c1f1;p=pspp

diff --git a/src/output/csv.c b/src/output/csv.c
index 17c26a0626..0493922241 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -30,6 +30,7 @@
 #include "output/driver-provider.h"
 #include "output/options.h"
 #include "output/message-item.h"
+#include "output/page-eject-item.h"
 #include "output/table-item.h"
 #include "output/table-provider.h"
 
@@ -128,26 +129,49 @@ csv_flush (struct output_driver *driver)
 }
 
 static void
-csv_output_field (struct csv_driver *csv, const char *field)
+csv_output_field__ (struct csv_driver *csv, struct substring field)
 {
-  while (*field == ' ')
-    field++;
+  ss_ltrim (&field, ss_cstr (" "));
 
-  if (csv->quote && field[strcspn (field, csv->quote_set)])
+  if (csv->quote && ss_cspan (field, ss_cstr (csv->quote_set)) < field.length)
     {
-      const char *p;
-
       putc (csv->quote, csv->file);
-      for (p = field; *p != '\0'; p++)
+      for (size_t i = 0; i < field.length; i++)
         {
-          if (*p == csv->quote)
+          if (field.string[i] == csv->quote)
             putc (csv->quote, csv->file);
-          putc (*p, csv->file);
+          putc (field.string[i], csv->file);
         }
       putc (csv->quote, csv->file);
     }
   else
-    fputs (field, csv->file);
+    fwrite (field.string, field.length, 1, csv->file);
+}
+
+static void
+csv_output_field (struct csv_driver *csv, const char *field)
+{
+  csv_output_field__ (csv, ss_cstr (field));
+}
+
+static void
+csv_put_separator (struct csv_driver *csv)
+{
+  if (csv->n_items++ > 0)
+    putc ('\n', csv->file);
+}
+
+static void
+csv_output_lines (struct csv_driver *csv, const char *text_)
+{
+  struct substring text = ss_cstr (text_);
+  struct substring line;
+  size_t save_idx = 0;
+  while (ss_separate (text, ss_cstr ("\n"), &save_idx, &line))
+    {
+      csv_output_field__ (csv, line);
+      putc ('\n', csv->file);
+    }
 }
 
 static void
@@ -173,13 +197,6 @@ csv_output_table_item_text (struct csv_driver *csv,
   putc ('\n', csv->file);
 }
 
-static void
-csv_put_separator (struct csv_driver *csv)
-{
-  if (csv->n_items++ > 0)
-    putc ('\n', csv->file);
-}
-
 static void
 csv_submit (struct output_driver *driver,
             const struct output_item *output_item)
@@ -198,9 +215,9 @@ csv_submit (struct output_driver *driver,
         csv_output_table_item_text (csv, table_item_get_title (table_item),
                                     "Table");
 
-      for (y = 0; y < table_nr (t); y++)
+      for (y = 0; y < t->n[TABLE_VERT]; y++)
         {
-          for (x = 0; x < table_nc (t); x++)
+          for (x = 0; x < t->n[TABLE_HORZ]; x++)
             {
               struct table_cell cell;
 
@@ -211,38 +228,32 @@ 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.n_contents == 1
-                       && cell.contents[0].text != NULL
-                       && cell.contents[0].n_footnotes == 0)
-                csv_output_field (csv, cell.contents[0].text);
+              else if (!(cell.options & TAB_MARKUP) && !cell.n_footnotes
+                       && !cell.n_subscripts && !cell.superscript)
+                csv_output_field (csv, cell.text);
               else
                 {
-                  struct string s;
-                  size_t i;
+                  struct string s = DS_EMPTY_INITIALIZER;
 
-                  ds_init_empty (&s);
-                  for (i = 0; i < cell.n_contents; i++)
+                  if (cell.options & TAB_MARKUP)
                     {
-                      const struct cell_contents *c = &cell.contents[i];
-
-                      if (i > 0)
-                        ds_put_cstr (&s, "\n\n");
-
-                      if (c->options & TAB_MARKUP)
-                        {
-                          char *t = output_get_text_from_markup (c->text);
-                          ds_put_cstr (&s, t);
-                          free (t);
-                        }
-                      else
-                        ds_put_cstr (&s, c->text);
-                      csv_format_footnotes (c->footnotes, c->n_footnotes, &s);
+                      char *t = output_get_text_from_markup (cell.text);
+                      ds_put_cstr (&s, t);
+                      free (t);
                     }
+                  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);
         }
@@ -258,13 +269,12 @@ csv_submit (struct output_driver *driver,
           fputs ("\nFootnotes:\n", csv->file);
 
           for (size_t i = 0; i < n_footnotes; i++)
-            if (f[i])
-              {
-                csv_output_field (csv, f[i]->marker);
-                fputs (csv->separator, csv->file);
-                csv_output_field (csv, f[i]->content);
-                putc ('\n', csv->file);
-              }
+            {
+              csv_output_field (csv, f[i]->marker);
+              fputs (csv->separator, csv->file);
+              csv_output_field (csv, f[i]->content);
+              putc ('\n', csv->file);
+            }
 
           free (f);
         }
@@ -279,15 +289,20 @@ csv_submit (struct output_driver *driver,
         return;
 
       csv_put_separator (csv);
+
       if (text_item->markup)
         {
           char *plain_text = output_get_text_from_markup (text);
-          csv_output_field (csv, plain_text);
+          csv_output_lines (csv, plain_text);
           free (plain_text);
         }
       else
-        csv_output_field (csv, text);
-      putc ('\n', csv->file);
+        csv_output_lines (csv, text);
+    }
+  else if (is_page_eject_item (output_item))
+    {
+      csv_put_separator (csv);
+      csv_output_lines (csv, "");
     }
   else if (is_message_item (output_item))
     {