X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.h;h=cc16576d31054e21670f3a3b42457654399f647e;hb=ada0a9f1d1ed94079e90fd2f0fe673ccddccceae;hp=7dcb0e34a479c2d5bf18cd431cd810e626decc6f;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp

diff --git a/src/data/settings.h b/src/data/settings.h
index 7dcb0e34a4..cc16576d31 100644
--- a/src/data/settings.h
+++ b/src/data/settings.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2015 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
@@ -28,9 +28,13 @@
 struct caseproto;
 struct settings;
 
-void settings_init (int *, int *);
+void settings_init (void);
 void settings_done (void);
 
+struct settings *settings_get (void);
+void settings_set (const struct settings *);
+void settings_destroy (struct settings *);
+
 enum float_format settings_get_input_float_format (void);
 void settings_set_input_float_format ( enum float_format);
 
@@ -88,12 +92,6 @@ void settings_set_mprint (bool);
 int settings_get_mxloops (void);
 void settings_set_mxloops ( int);
 
-bool settings_get_nulline (void);
-void settings_set_nulline (bool);
-
-char settings_get_endcmd (void);
-void settings_set_endcmd (char);
-
 size_t settings_get_workspace (void);
 size_t settings_get_workspace_cases (const struct caseproto *);
 void settings_set_workspace (size_t);
@@ -104,6 +102,31 @@ void settings_set_format ( const struct fmt_spec *);
 bool settings_get_testing_mode (void);
 void settings_set_testing_mode (bool);
 
+int settings_get_fuzzbits (void);
+void settings_set_fuzzbits (int);
+
+/* Whether to show variable or value labels or the underlying value or variable
+   name. */
+enum settings_value_show
+  {
+    /* Use higher-level default.
+       In a pivot_value, the default is taken from the pivot_table.
+       In a pivot_table, the default is a global default.
+       As a global default, this is invalid. */
+    SETTINGS_VALUE_SHOW_DEFAULT = 0,
+
+    SETTINGS_VALUE_SHOW_VALUE = 1, /* Show value or variable name only. */
+    SETTINGS_VALUE_SHOW_LABEL = 2, /* Show label only. */
+    SETTINGS_VALUE_SHOW_BOTH = 3,  /* Show both value/name and label. */
+  };
+
+enum settings_value_show settings_get_show_values (void);
+enum settings_value_show settings_get_show_variables (void);
+
+void settings_set_show_values (enum settings_value_show);
+void settings_set_show_variables (enum settings_value_show);
+
+
 enum behavior_mode {
   ENHANCED,             /* Use improved PSPP behavior. */
   COMPATIBLE            /* Be as compatible as possible. */
@@ -145,6 +168,8 @@ enum settings_output_type
     SETTINGS_N_OUTPUT_TYPES
   };
 
+
+
 void settings_set_output_routing (enum settings_output_type,
                                   enum settings_output_devices);
 enum settings_output_devices settings_get_output_routing (