// HP-UX 11.x doesn't have this header
#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
+# include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
#endif
-#include <sys/time.h>
using boost::shared_ptr;
int LaunchIspell::start()
{
command_ = lyxrc.isp_command;
- return runNonBlocking();
+ return run(DontWait);
}
if (lyxrc.isp_use_input_encoding &&
params.inputenc != "default") {
string enc = (params.inputenc == "auto")
- ? params.language->encoding()->LatexName()
+ ? params.language->encoding()->latexName()
: params.inputenc;
string::size_type n = enc.length();
tmp = new char[3];
error_ = buf;
} else {
// select returned error
- error_ = _("The spell process returned an error.\nPerhaps "
+ error_ = _("The ispell process returned an error.\nPerhaps "
"it has been configured wrongly ?");
}
bool error = select(err_read);
if (error) {
- error_ = _("Could not communicate with the spell-checker program.");
- return UNKNOWN;
+ error_ = _("Could not communicate with the ispell spellchecker process.");
+ return UNKNOWN_WORD;
}
if (err_read) {
error_ = buf;
- return UNKNOWN;
+ return UNKNOWN_WORD;
}
// I think we have to check if ispell is still alive here because
// the signal-handler could have disabled blocking on the fd
if (!alive())
- return UNKNOWN;
+ return UNKNOWN_WORD;
switch (*buf) {
case '*':
res = ROOT;
break;
case '-':
- res = COMPOUNDWORD;
+ res = COMPOUND_WORD;
break;
case '\n':
- res = IGNORE;
+ res = IGNORED_WORD;
break;
case '#': // Not found, no near misses and guesses
- res = UNKNOWN;
+ res = UNKNOWN_WORD;
break;
case '?': // Not found, and no near misses, but guesses (guesses are ignored)
case '&': // Not found, but we have near misses
{
- res = MISSED;
+ res = SUGGESTED_WORDS;
char * p = strpbrk(buf, ":");
str = new char[strlen(p) + 1];
e = str;
break;
}
default: // This shouldn't happen, but you know Murphy
- res = UNKNOWN;
+ res = UNKNOWN_WORD;
}
*buf = 0;
- if (res != IGNORE) {
+ if (res != IGNORED_WORD) {
/* wait for ispell to finish */
while (*buf!= '\n')
fgets(buf, 255, in);