X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable-item.c;h=e9b854040a823982c36ac96690f7594c9a3a90b0;hb=c1279d1145ad588c0b4831df5b8ee4d802892b73;hp=c7c0f91c9cea8ca20911661fa0ee7698f72d95bf;hpb=458ebdc8a14f6f3cb28dfb991b7cf1d2e422a852;p=pspp

diff --git a/src/output/table-item.c b/src/output/table-item.c
index c7c0f91c9c..e9b854040a 100644
--- a/src/output/table-item.c
+++ b/src/output/table-item.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011, 2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,28 +16,70 @@
 
 #include <config.h>
 
-#include <output/table-provider.h>
+#include "output/table-provider.h"
 
 #include <assert.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <output/driver.h>
-#include <output/output-item-provider.h>
-#include <output/table-item.h>
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "output/driver.h"
+#include "output/output-item-provider.h"
+#include "output/table-item.h"
 
 #include "gl/xalloc.h"
 
+struct table_item_text *
+table_item_text_create (const char *content)
+{
+  if (!content)
+    return NULL;
+
+  struct table_item_text *text = xmalloc (sizeof *text);
+  *text = (struct table_item_text) { .content = xstrdup (content) };
+  return text;
+}
+
+struct table_item_text *
+table_item_text_clone (const struct table_item_text *old)
+{
+  if (!old)
+    return NULL;
+
+  struct table_item_text *new = xmalloc (sizeof *new);
+  *new = (struct table_item_text) {
+    .content = xstrdup (old->content),
+    .footnotes = xmemdup (old->footnotes,
+                          old->n_footnotes * sizeof *old->footnotes),
+    .n_footnotes = old->n_footnotes,
+    .style = area_style_clone (NULL, old->style),
+  };
+  return new;
+}
+
+void
+table_item_text_destroy (struct table_item_text *text)
+{
+  if (text)
+    {
+      free (text->content);
+      free (text->footnotes);
+      area_style_free (text->style);
+      free (text);
+    }
+}
+
 /* Initializes ITEM as a table item for rendering TABLE.  The new table item
-   initially has the specified CAPTION, which may be NULL if no caption is yet
-   available.  The caller retains ownership of CAPTION. */
+   initially has the specified TITLE and CAPTION, which may each be NULL.  The
+   caller retains ownership of TITLE and CAPTION. */
 struct table_item *
-table_item_create (struct table *table, const char *caption)
+table_item_create (struct table *table, const char *title, const char *caption)
 {
   struct table_item *item = xmalloc (sizeof *item);
   output_item_init (&item->output_item, &table_item_class);
   item->table = table;
-  item->caption = caption != NULL ? xstrdup (caption) : NULL;
+  item->title = table_item_text_create (title);
+  item->layers = NULL;
+  item->caption = table_item_text_create (caption);
   return item;
 }
 
@@ -49,9 +91,52 @@ table_item_get_table (const struct table_item *table_item)
   return table_item->table;
 }
 
+/* Returns ITEM's title, which is a null pointer if no title has been
+   set. */
+const struct table_item_text *
+table_item_get_title (const struct table_item *item)
+{
+  return item->title;
+}
+
+/* Sets ITEM's title to TITLE, replacing any previous title.  Specify NULL for
+   TITLE to clear any title from ITEM.  The caller retains ownership of TITLE.
+
+   This function may only be used on a table_item that is unshared. */
+void
+table_item_set_title (struct table_item *item,
+                      const struct table_item_text *title)
+{
+  assert (!table_item_is_shared (item));
+  table_item_text_destroy (item->title);
+  item->title = table_item_text_clone (title);
+}
+
+/* Returns ITEM's layers, which will be a null pointer if no layers have been
+   set. */
+const struct table_item_text *
+table_item_get_layers (const struct table_item *item)
+{
+  return item->layers;
+}
+
+/* Sets ITEM's layers to LAYERS, replacing any previous layers.  Specify NULL
+   for LAYERS to clear any layers from ITEM.  The caller retains ownership of
+   LAYERS.
+
+   This function may only be used on a table_item that is unshared. */
+void
+table_item_set_layers (struct table_item *item,
+                      const struct table_item_text *layers)
+{
+  assert (!table_item_is_shared (item));
+  table_item_text_destroy (item->layers);
+  item->layers = table_item_text_clone (layers);
+}
+
 /* Returns ITEM's caption, which is a null pointer if no caption has been
    set. */
-const char *
+const struct table_item_text *
 table_item_get_caption (const struct table_item *item)
 {
   return item->caption;
@@ -63,11 +148,12 @@ table_item_get_caption (const struct table_item *item)
 
    This function may only be used on a table_item that is unshared. */
 void
-table_item_set_caption (struct table_item *item, const char *caption)
+table_item_set_caption (struct table_item *item,
+                        const struct table_item_text *caption)
 {
   assert (!table_item_is_shared (item));
-  free (item->caption);
-  item->caption = caption != NULL ? xstrdup (caption) : NULL;
+  table_item_text_destroy (item->caption);
+  item->caption = table_item_text_clone (caption);
 }
 
 /* Submits TABLE_ITEM to the configured output drivers, and transfers ownership
@@ -82,12 +168,15 @@ static void
 table_item_destroy (struct output_item *output_item)
 {
   struct table_item *item = to_table_item (output_item);
-  free (item->caption);
+  table_item_text_destroy (item->title);
+  table_item_text_destroy (item->layers);
+  table_item_text_destroy (item->caption);
   table_unref (item->table);
   free (item);
 }
 
 const struct output_item_class table_item_class =
   {
+    "table",
     table_item_destroy,
   };