#include <config.h>
-#include <locale.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <ieeefp.h>
#endif
+
+#include <libpspp/i18n.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
#include <libpspp/getl.h>
#include <libpspp/message.h>
#include <libpspp/version.h>
#include <math/random.h>
-#include <output/output.h>
+#include <output/driver.h>
#include <ui/debugger.h>
#include <ui/terminal/msg-ui.h>
#include <ui/terminal/read-line.h>
#include "fatal-signal.h"
#include "progname.h"
+#include "relocatable.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-static void i18n_init (void);
static void fpu_init (void);
static void clean_up (void);
fpu_init ();
gsl_set_error_handler_off ();
- outp_init ();
fn_init ();
fh_init ();
the_source_stream =
_("Options affecting input and output locations:"), the_source_stream);
command_line_processor_add_options (clp, &test_argp,
- _("Diagnositic options:"), the_source_stream);
+ _("Diagnostic options:"), the_source_stream);
command_line_processor_add_options (clp, &post_init_argp,
_("Options affecting syntax and behavior:"), the_source_stream);
msg_ui_init (the_source_stream);
- if (!settings_get_testing_mode ())
- {
- outp_read_devices ();
- }
- else
- {
- outp_configure_driver_line
- (
- ss_cstr ("raw-ascii:ascii:listing:width=9999 length=9999 "
- "output-file=\"pspp.list\" emphasis=none "
- "headers=off paginate=off squeeze=on "
- "top-margin=0 bottom-margin=0"));
- }
-
the_lexer = lex_create (the_source_stream);
for (;;)
return any_errors ();
}
\f
-static void
-i18n_init (void)
-{
-#if ENABLE_NLS
-#if HAVE_LC_MESSAGES
- setlocale (LC_MESSAGES, "");
-#endif
-#if HAVE_LC_PAPER
- setlocale (LC_PAPER, "");
-#endif
- bindtextdomain (PACKAGE, locale_dir);
- textdomain (PACKAGE);
-#endif /* ENABLE_NLS */
-}
static void
fpu_init (void)
destroy_source_stream (the_source_stream);
prompt_done ();
readln_uninitialize ();
- outp_done ();
+ output_close ();
msg_ui_done ();
+ i18n_done ();
}
}