#include <config.h>
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
#include <unistd.h>
#include <fcntl.h>
#include <cstdlib>
#endif
#ifdef HAVE_SYS_SELECT_H
+# ifdef HAVE_STRINGS_H
+ // <strings.h> is needed at least on AIX because FD_ZERO uses bzero().
+# include <strings.h>
+# endif
#include <sys/select.h>
#endif
#include "lyx_gui_misc.h"
#include "debug.h"
#include "support/lstrings.h"
+#include "encoding.h"
-
+using std::reverse;
using std::endl;
// Spellchecker status
argv[argc++] = tmp;
}
if (lyxrc.isp_use_input_encoding &&
- params.inputenc != "default") {
+ params.inputenc != "default") {
+ string enc = (params.inputenc == "auto")
+ ? params.language_info->encoding()->LatexName()
+ : params.inputenc;
+ string::size_type n = enc.length();
tmp = new char[3];
string("-T").copy(tmp, 2); tmp[2] = '\0';
argv[argc++] = tmp; // Input encoding
- tmp = new char[params.inputenc.length() + 1];
- params.inputenc.copy(tmp, params.inputenc.length());
- tmp[params.inputenc.length()] = '\0';
+ tmp = new char[n + 1];
+ enc.copy(tmp, n);
+ tmp[n] = '\0';
argv[argc++] = tmp;
}
if (fd_form_spell_check == 0) {
fd_form_spell_check = create_form_form_spell_check();
// Make sure pressing the close box does not kill LyX. (RvdK)
- fl_set_form_atclose(fd_form_spell_check->form_spell_check, IgnoreCloseBoxCB, 0);
+ fl_set_form_atclose(fd_form_spell_check->form_spell_check,
+ CancelCloseBoxCB, 0);
}
// Clear form
"Check /usr/lib/ispell or set another\n"
"dictionary in the Spellchecker Options menu."), "", "");
fclose(out);
- return true;
+ return false;
}
// Put ispell in terse mode to improve speed