#include "data/settings.h"
-#include "data/file-name.h"
#include "language/lexer/include-path.h"
#include "libpspp/argv-parser.h"
#include "libpspp/assertion.h"
struct string_set format_set;
char *format_string;
const char *format;
- size_t i;
/* Get supported formats as unordered set. */
string_set_init (&format_set);
char *inc_path = string_array_join (include_path_default (), " ");
printf (_("\
-PSPP, a program for statistical analysis of sample data.\n\
+PSPP, a program for statistical analysis of sampled data.\n\
Usage: %s [OPTION]... FILE...\n\
\n\
Arguments to long options also apply to equivalent short options.\n\
return to;
}
+/* Return true iff the terminal appears to be an xterm with
+ UTF-8 capabilities */
+static bool
+term_is_utf8_xterm (void)
+{
+ char *s = NULL;
+
+ if ( (s = getenv ("TERM")) && (0 == strcmp ("xterm", s)) )
+ if ( (s = getenv ("XTERM_LOCALE")) )
+ return strcasestr (s, "utf8") || strcasestr (s, "utf-8");
+
+ return false;
+}
+
void
terminal_opts_done (struct terminal_opts *to, int argc, char *argv[])
{
- if (0 == strcmp (locale_charset (), "UTF-8"))
- string_map_insert (&to->options, "box", "unicode");
register_output_driver (to);
if (!to->has_output_driver)
{
+ if ((0 == strcmp (locale_charset (), "UTF-8"))
+ ||
+ (term_is_utf8_xterm ()) )
+ {
+ string_map_insert (&to->options, "box", "unicode");
+ }
+
string_map_insert (&to->options, "output-file", "-");
string_map_insert (&to->options, "format", "txt");
register_output_driver (to);