output: Add support for Pango markup of fonts and styles.

[pspp] / src / output / csv.c

diff --git a/src/output/csv.c b/src/output/csv.c
index 8493df34c613e02b35c519126f73364ce55e0473..17c26a062605f96523b96e9cb17ed5ca893a0f0b 100644 (file)
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -228,7 +228,14 @@ csv_submit (struct output_driver *driver,
                       if (i > 0)
                         ds_put_cstr (&s, "\n\n");
 
-                      ds_put_cstr (&s, c->text);
+                      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);
                     }
                   csv_output_field (csv, ds_cstr (&s));
@@ -272,7 +279,14 @@ csv_submit (struct output_driver *driver,
         return;
 
       csv_put_separator (csv);
-      csv_output_field (csv, text);
+      if (text_item->markup)
+        {
+          char *plain_text = output_get_text_from_markup (text);
+          csv_output_field (csv, plain_text);
+          free (plain_text);
+        }
+      else
+        csv_output_field (csv, text);
       putc ('\n', csv->file);
     }
   else if (is_message_item (output_item))