X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fpivot-table.h;h=377579a013d356b3f5feb4cea5959381be201ae8;hb=81dece3642da9bdcbdec4aa09b0c2008c86d6161;hp=8006adaf00f851d61f04117bbcfdb4937dd263b1;hpb=5c94e7624e9d6ec6e4c65bf7445f5aa05e1b4600;p=pspp

diff --git a/src/output/pivot-table.h b/src/output/pivot-table.h
index 8006adaf00..377579a013 100644
--- a/src/output/pivot-table.h
+++ b/src/output/pivot-table.h
@@ -107,7 +107,7 @@ enum pivot_area
   };
 
 const char *pivot_area_to_string (enum pivot_area);
-void pivot_area_get_default_style (enum pivot_area, struct area_style *);
+const struct area_style *pivot_area_get_default_style (enum pivot_area);
 
 /* Table borders for styling purposes. */
 enum pivot_border
@@ -221,7 +221,7 @@ struct pivot_axis
    breaks out of the loop prematurely, it needs to free it with free(). */
 #define PIVOT_AXIS_FOR_EACH(INDEXES, AXIS)                              \
   for ((INDEXES) = NULL;                                                \
-       ((INDEXES) = pivot_axis_iterator_next (INDEXES, AXIS)) != NULL; )
+       ((INDEXES) = pivot_axis_iterator_next (INDEXES, AXIS)) != NULL;)
 size_t *pivot_axis_iterator_next (size_t *indexes, const struct pivot_axis *);
 
 /* Dimensions.
@@ -385,6 +385,7 @@ struct pivot_table
     bool rotate_outer_row_labels;
     bool row_labels_in_corner;
     bool show_grid_lines;
+    bool show_caption;
     bool omit_empty;       /* Omit empty rows and columns? */
     size_t *current_layer; /* axis[PIVOT_AXIS_LAYER].n_dimensions elements. */
     char *table_look;
@@ -432,7 +433,7 @@ struct pivot_table
 
     /* Titles. */
     struct pivot_value *title;
-    struct pivot_value *subtype;  /* Same as pivot_item's subtype. */
+    struct pivot_value *subtype;  /* Same as spv_item's subtype. */
     struct pivot_value *corner_text;
     struct pivot_value *caption;
     char *notes;
@@ -453,7 +454,8 @@ struct pivot_table
 
 /* Creating and destroy pivot tables. */
 struct pivot_table *pivot_table_create (const char *title);
-struct pivot_table *pivot_table_create__ (struct pivot_value *title);
+struct pivot_table *pivot_table_create__ (struct pivot_value *title,
+                                          const char *subtype);
 struct pivot_table *pivot_table_create_for_text (struct pivot_value *title,
                                                  struct pivot_value *content);
 
@@ -500,6 +502,7 @@ struct pivot_footnote
     size_t idx;
     struct pivot_value *content;
     struct pivot_value *marker;
+    bool show;
   };
 
 struct pivot_footnote *pivot_table_create_footnote (
@@ -598,7 +601,10 @@ struct pivot_value
   {
     struct font_style *font_style;
     struct cell_style *cell_style;
-    char *subscript;
+
+    char **subscripts;
+    size_t n_subscripts;
+
     char *superscript;
 
     const struct pivot_footnote **footnotes;
@@ -651,7 +657,8 @@ struct pivot_value
         /* PIVOT_VALUE_TEMPLATE. */
         struct
           {
-            char *s;
+            char *local;              /* Localized. */
+            char *id;                 /* Identifier. */
             struct pivot_argument *args;
             size_t n_args;
           }
@@ -705,7 +712,8 @@ void pivot_value_destroy (struct pivot_value *);
 
 /* Styling. */
 void pivot_value_get_style (struct pivot_value *,
-                            const struct area_style *default_style,
+                            const struct font_style *base_font_style,
+                            const struct cell_style *base_cell_style,
                             struct area_style *);
 void pivot_value_set_style (struct pivot_value *, const struct area_style *);