output: Make table_item a pivot_table, table_cell a pivot_value.

[pspp] / src / output / spv / spv-output.c

diff --git a/src/output/spv/spv-output.c b/src/output/spv/spv-output.c
index cb4964a7f1d7bdf9d4c33b6fd661e366769684dd..c21ec22bcb29bc0c80dfd98cc41462e24aeea527 100644 (file)
--- a/src/output/spv/spv-output.c
+++ b/src/output/spv/spv-output.c
@@ -33,20 +33,14 @@ spv_text_submit (const struct spv_item *in)
        : class == SPV_CLASS_PAGETITLE ? TEXT_ITEM_PAGE_TITLE
        : TEXT_ITEM_LOG);
   const struct pivot_value *value = spv_item_get_text (in);
-  char *text = pivot_value_to_string (value, SETTINGS_VALUE_SHOW_DEFAULT,
-                                      SETTINGS_VALUE_SHOW_DEFAULT);
+  char *text = pivot_value_to_string_defaults (value);
   char *label = in->label ? xstrdup (in->label) : NULL;
   struct text_item *item = text_item_create_nocopy (type, text, label);
-  const struct font_style *font = value->font_style;
-  if (font)
+
+  if (value->font_style)
     {
-      item->bold = font->bold;
-      item->italic = font->italic;
-      item->underline = font->underline;
-      item->markup = font->markup;
-      if (font->typeface)
-        item->typeface = xstrdup (font->typeface);
-      item->size = font->size;
+      font_style_uninit (&item->style);
+      font_style_copy (NULL, &item->style, value->font_style);
     }
   text_item_submit (item);
 }