#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>
+ // BUT we cannot include both string.h and strings.h on Irix 6.5 :(
+# ifdef _AIX
+# include <strings.h>
+# endif
# endif
#include <sys/select.h>
#endif
if (lyxrc.isp_use_input_encoding &&
params.inputenc != "default") {
string enc = (params.inputenc == "auto")
- ? params.language_info->encoding()->LatexName()
+ ? params.language->encoding()->LatexName()
: params.inputenc;
string::size_type n = enc.length();
tmp = new char[3];
static
void sc_clean_up_after_error()
{
- fclose(out);
+ ::fclose(out);
}
// Send word to ispell and get reply
{
//Please rewrite to use string.
- fputs(word.c_str(), out);
- fputc('\n', out);
+ ::fputs(word.c_str(), out);
+ ::fputc('\n', out);
char buf[1024];
- fgets(buf, 1024, in);
+ ::fgets(buf, 1024, in);
/* I think we have to check if ispell is still alive here because
the signal-handler could have disabled blocking on the fd */
static inline
void sc_insert_word(string const & word)
{
- fputc('*', out); // Insert word in personal dictionary
- fputs(word.c_str(), out);
- fputc('\n', out);
+ ::fputc('*', out); // Insert word in personal dictionary
+ ::fputs(word.c_str(), out);
+ ::fputc('\n', out);
}
static inline
void sc_accept_word(string const & word)
{
- fputc('@', out); // Accept in this session
- fputs(word.c_str(), out);
- fputc('\n', out);
+ ::fputc('@', out); // Accept in this session
+ ::fputs(word.c_str(), out);
+ ::fputc('\n', out);
}
static inline
void sc_store_replacement(string const & mis, string const & cor) {
if(actual_spell_checker == ASC_ASPELL) {
- fputs("$$ra ", out);
- fputs(mis.c_str(), out);
- fputc(',', out);
- fputs(cor.c_str(), out);
- fputc('\n', out);
+ ::fputs("$$ra ", out);
+ ::fputs(mis.c_str(), out);
+ ::fputc(',', out);
+ ::fputs(cor.c_str(), out);
+ ::fputc('\n', out);
}
}
{
PspellConfig * config = new_pspell_config();
string code;
- (void)split(lang, code, '_');
+ split(lang, code, '_');
config->replace("language-tag", code.c_str());
spell_error_object = new_pspell_manager(config);
if (pspell_error_number(spell_error_object) != 0) {
isp_result * sc_check_word(string const & word)
{
isp_result * result = new isp_result;
+#warning Why isnt word_ok a bool? (Lgb)
int word_ok = pspell_manager_check(sc, word.c_str());
Assert(word_ok != -1);
fl_set_object_lcol(fd_form_spell_check->input, FL_INACTIVE);
fl_set_object_lcol(fd_form_spell_check->browser, FL_INACTIVE);
- while (true){
+ while (true) {
obj = fl_do_forms();
- if (obj == fd_form_spell_check->options){
+ if (obj == fd_form_spell_check->options) {
SpellCheckerOptions();
}
- if (obj == fd_form_spell_check->start){
+ if (obj == fd_form_spell_check->start) {
// activate insert, accept, and stop
fl_activate_object(fd_form_spell_check->insert);
fl_activate_object(fd_form_spell_check->accept);
#ifdef USE_PSPELL
string tmp = (lyxrc.isp_use_alt_lang) ?
- lyxrc.isp_alt_lang : bv->buffer()->params.language_info->code();
+ lyxrc.isp_alt_lang : bv->buffer()->params.language->code();
#else
string tmp = (lyxrc.isp_use_alt_lang) ?
- lyxrc.isp_alt_lang : bv->buffer()->GetLanguage();
+ lyxrc.isp_alt_lang : bv->buffer()->params.language->lang();
#endif
-#warning This is not good we should find a way to identify a rtl-language in a more general way. Please have a look Dekel! (Jug)
-// For now I'll change this to a bit more general solution but
-// Please comment on this if you don't like it. We probaly need
-// anoter flag something like lyxrc.isp_use_alt_lang_rtl (true/false)!
- bool rtl;
- if (lyxrc.isp_use_alt_lang)
- rtl = (tmp == "hebrew" || tmp == "arabic");
- else
- rtl = bv->buffer()->params.language_info->RightToLeft();
+ bool rtl = false;
+ if (lyxrc.isp_use_alt_lang) {
+ Language const * lang = languages.getLanguage(tmp);
+ if (lang)
+ rtl = lang->RightToLeft();
+ } else
+ rtl = bv->buffer()->params.language->RightToLeft();
int oldval = 0; /* used for updating slider only when needed */
float newval = 0.0;