X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsettings.h;h=409b7fe9ebffb690340dc8ebfbc3f0aca2fb442e;hb=5f9212b9af772575bd3026ca9643684ce6493b3c;hp=e68325f7f2bca21aed2ef100420a170b15c2522a;hpb=a258e53c63a08b0ec48aea8f03808eb651729424;p=pspp

diff --git a/src/data/settings.h b/src/data/settings.h
index e68325f7f2..409b7fe9eb 100644
--- a/src/data/settings.h
+++ b/src/data/settings.h
@@ -92,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);
@@ -108,6 +102,28 @@ void settings_set_format ( const struct fmt_spec *);
 bool settings_get_testing_mode (void);
 void settings_set_testing_mode (bool);
 
+enum settings_var_style
+  {
+    SETTINGS_VAR_STYLE_NAMES,
+    SETTINGS_VAR_STYLE_LABELS,
+    SETTINGS_VAR_STYLE_BOTH
+  };
+
+enum settings_value_style
+  {
+    SETTINGS_VAL_STYLE_VALUES,
+    SETTINGS_VAL_STYLE_LABELS,
+    SETTINGS_VAL_STYLE_BOTH
+  };
+
+
+enum settings_value_style settings_get_value_style (void);
+enum settings_var_style settings_get_var_style (void);
+
+void settings_set_value_style (enum settings_value_style s);
+void settings_set_var_style (enum settings_var_style s);
+
+
 enum behavior_mode {
   ENHANCED,             /* Use improved PSPP behavior. */
   COMPATIBLE            /* Be as compatible as possible. */
@@ -149,6 +165,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 (