X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fspellchecker.C;h=04a578affd791a636bf98aca837ba5c9bff223dd;hb=a69e7a45780e94f4330a91facfe35126c678e34e;hp=514c014242ef277ae02339e6ae4f177c2692abf1;hpb=e8cc17cba76a77164567cd3d792f1290c6f7ad7b;p=lyx.git

diff --git a/src/spellchecker.C b/src/spellchecker.C
index 514c014242..04a578affd 100644
--- a/src/spellchecker.C
+++ b/src/spellchecker.C
@@ -12,6 +12,10 @@
 
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <cstdlib>
@@ -34,9 +38,15 @@
 #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 <algorithm>
+
 #include "LString.h"
 #include "sp_form.h"
 #include "spellchecker.h"
@@ -48,8 +58,9 @@
 #include "lyx_gui_misc.h"
 #include "debug.h"
 #include "support/lstrings.h"
+#include "encoding.h"
 
-
+using std::reverse;
 using std::endl;
 
 // Spellchecker status
@@ -325,13 +336,17 @@ void create_ispell_pipe(BufferParams const & params, string const & lang)
 			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;
 		}
 
@@ -532,7 +547,8 @@ void ShowSpellChecker(BufferView * bv)
 	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
@@ -643,6 +659,7 @@ bool RunSpellChecker(BufferView * bv)
 	FL_OBJECT * obj;
 
 	string tmp = (lyxrc.isp_use_alt_lang) ? lyxrc.isp_alt_lang : bv->buffer()->GetLanguage();
+	bool rtl = tmp == "hebrew" || tmp == "arabic";
 
 	int oldval = 0;  /* used for updating slider only when needed */
 	float newval = 0.0;
@@ -659,7 +676,7 @@ bool RunSpellChecker(BufferView * bv)
 			  "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
@@ -704,11 +721,21 @@ bool RunSpellChecker(BufferView * bv)
 		case ISP_MISSED:
 		{
 			bv->selectLastWord();
-			fl_set_object_label(fd_form_spell_check->text, word);
+			if (rtl) {
+				string tmp = word;
+				reverse(tmp.begin(),tmp.end());
+				fl_set_object_label(fd_form_spell_check->text, tmp.c_str());
+			} else
+				fl_set_object_label(fd_form_spell_check->text, word);
 			fl_set_input(fd_form_spell_check->input, word);
 			fl_clear_browser(fd_form_spell_check->browser);
 			for (i = 0; i < result->count; ++i) {
-				fl_add_browser_line(fd_form_spell_check->browser, result->misses[i]);
+				if (rtl) {
+					string tmp = result->misses[i];
+					reverse(tmp.begin(),tmp.end());
+					fl_add_browser_line(fd_form_spell_check->browser, tmp.c_str());
+				} else
+					fl_add_browser_line(fd_form_spell_check->browser, result->misses[i]);
 			}
 
 			int clickline = -1;
@@ -741,10 +768,17 @@ bool RunSpellChecker(BufferView * bv)
 						break;
 					}
 					clickline = fl_get_browser(fd_form_spell_check->browser);
-					fl_set_input(fd_form_spell_check->input, 
-						     fl_get_browser_line(fd_form_spell_check->browser,
-									 fl_get_browser(fd_form_spell_check->browser)));
-						     
+					/// Why not use
+					/// fl_set_input(fd_form_spell_check->input, result->misses[clickline-1]); ?
+					if (rtl) {
+						string tmp = fl_get_browser_line(fd_form_spell_check->browser,
+										 clickline);
+						reverse(tmp.begin(),tmp.end());
+						fl_set_input(fd_form_spell_check->input, tmp.c_str());
+					} else
+						fl_set_input(fd_form_spell_check->input,
+							     fl_get_browser_line(fd_form_spell_check->browser,
+										 clickline));
 				}
 				if (obj == fd_form_spell_check->stop) {
 					delete result;