text-item: Simplify text_item further to just hold a pivot_value.

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

diff --git a/src/output/text-item.h b/src/output/text-item.h
index 8b4114e0061dc1b4960c04dcab43735d121cb552..49b5bbe1ebf531b5e216e46595395b7a10ffeb6b 100644 (file)
--- a/src/output/text-item.h
+++ b/src/output/text-item.h
@@ -43,18 +43,20 @@ const char *text_item_type_to_string (enum text_item_type);
 struct text_item
   {
     struct output_item output_item;
-    char *text;                 /* The content. */
-    enum text_item_type type;   /* Type. */
-    struct font_style style;
+    enum text_item_type type;
+    struct pivot_value *text;
   };
 
 struct text_item *text_item_create (enum text_item_type,
                                     const char *text, const char *label);
 struct text_item *text_item_create_nocopy (enum text_item_type,
                                            char *text, char *label);
+struct text_item *text_item_create_value (enum text_item_type,
+                                          struct pivot_value *value,
+                                          char *label);
 
 enum text_item_type text_item_get_type (const struct text_item *);
-const char *text_item_get_text (const struct text_item *);
+char *text_item_get_plain_text (const struct text_item *);
 
 struct text_item *text_item_unshare (struct text_item *);
 bool text_item_append (struct text_item *dst, const struct text_item *src);