text-item: Use struct font_style instead of individual fields.

[pspp] / src / output / text-item.h

diff --git a/src/output/text-item.h b/src/output/text-item.h
index 28e2457a2c9f8c76491b5243ee259108aeb745c2..8b4114e0061dc1b4960c04dcab43735d121cb552 100644 (file)
--- a/src/output/text-item.h
+++ b/src/output/text-item.h
@@ -27,6 +27,7 @@
 #include <stdbool.h>
 #include "libpspp/compiler.h"
 #include "output/output-item.h"
+#include "output/table.h"
 
 enum text_item_type
   {
@@ -44,10 +45,7 @@ struct text_item
     struct output_item output_item;
     char *text;                 /* The content. */
     enum text_item_type type;   /* Type. */
-
-    bool bold, italic, underline, markup;
-    char *typeface;
-    int size;
+    struct font_style style;
   };
 
 struct text_item *text_item_create (enum text_item_type,