Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...

[pspp-builds.git] / src / data / dictionary.h

diff --git a/src/data/dictionary.h b/src/data/dictionary.h
index 167487fbd10a34182ed5457c62a7770262c8e794..682409e24216a11c7492cb39082b30d62f101f19 100644 (file)
--- a/src/data/dictionary.h
+++ b/src/data/dictionary.h
@@ -75,11 +75,14 @@ void dict_reorder_var (struct dictionary *, struct variable *,
 void dict_reorder_vars (struct dictionary *,
                         struct variable *const *, size_t count);
 
-/* Changing variable names. */
+/* Variable names. */
 void dict_rename_var (struct dictionary *, struct variable *, const char *);
 bool dict_rename_vars (struct dictionary *,
                        struct variable **, char **new_names,
                        size_t count, char **err_name);
+bool dict_make_unique_var_name (const struct dictionary *, const char *hint,
+                                unsigned long int *num_start,
+                                char name[]);
 
 /* Weight variable. */
 double dict_get_case_weight (const struct dictionary *,
@@ -139,6 +142,11 @@ const struct vector *dict_lookup_vector (const struct dictionary *,
                                          const char *name);
 void dict_clear_vectors (struct dictionary *);
 
+/* Attributes. */
+struct attrset *dict_get_attributes (const struct dictionary *);
+void dict_set_attributes (struct dictionary *, const struct attrset *);
+bool dict_has_attributes (const struct dictionary *);
+
 /* Functions to be called upon dictionary changes. */
 struct dict_callbacks
  {
@@ -149,6 +157,7 @@ struct dict_callbacks
   void (*weight_changed) (struct dictionary *, int, void *);
   void (*filter_changed) (struct dictionary *, int, void *);
   void (*split_changed) (struct dictionary *, void *);
+  void (*var_display_width_changed) (struct dictionary *, int, void *);
  };
 
 void dict_set_callbacks (struct dictionary *, const struct dict_callbacks *,