Jean-Marc Lasgouttes wrote:
> Angus> Michael Schmitt wrote:
>>> Hi Angus, what happened to the "spell checker" patch?
> Angus> Jean-Marc has it. He's on holiday...
> It is always my fault...
> Angus> Ok, Ok, I'll apply it. Modulo the "history" changes that Lars
> Angus> didn't want.
> Did you?
No, but I dug it out again last night. Here's the updated patch which I'll
apply shortly to the 1.4 tree.
--
Angus
Index: config/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/ChangeLog,v
retrieving revision 1.172
diff -u -p -r1.172 ChangeLog
--- config/ChangeLog 18 Jul 2005 17:10:34 -0000 1.172
+++ config/ChangeLog 8 Sep 2005 08:18:34 -0000
@@ -1,3 +1,8 @@
+2005-09-08 Angus Leeming <[EMAIL PROTECTED]>
+
+ * spell.m4: correct grammar describing invocation of the
+ spellchecker.
+
2005-07-18 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* common.am (AUTOMAKE_OPTIONS): add dist-bzip2
Index: config/spell.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/spell.m4,v
retrieving revision 1.3
diff -u -p -r1.3 spell.m4
--- config/spell.m4 9 Jun 2005 09:58:01 -0000 1.3
+++ config/spell.m4 8 Sep 2005 08:18:34 -0000
@@ -70,7 +70,7 @@ AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
AC_MSG_CHECKING([whether to use ispell])
if $lyx_use_ispell ; then
AC_MSG_RESULT(yes)
- AC_DEFINE(USE_ISPELL, 1, [Define as 1 to use an external ispell process for spell-checking])
+ AC_DEFINE(USE_ISPELL, 1, [Define as 1 to use an external ispell process to check spelling])
lyx_flags="$lyx_flags use-ispell"
else
AC_MSG_RESULT(no)
Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.732
diff -u -p -r1.732 ChangeLog
--- lib/ChangeLog 6 Sep 2005 17:32:08 -0000 1.732
+++ lib/ChangeLog 8 Sep 2005 08:18:39 -0000
@@ -1,3 +1,9 @@
+2005-09-08 Angus Leeming <[EMAIL PROTECTED]>
+
+ * configure.m4:
+ * lyxrc.example: correct grammar describing invocation of the
+ spellchecker.
+
2005-09-06 Michael Gerz <[EMAIL PROTECTED]>
* CREDITS:
Index: lib/configure.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/configure.m4,v
retrieving revision 1.107
diff -u -p -r1.107 configure.m4
--- lib/configure.m4 4 Sep 2005 11:48:21 -0000 1.107
+++ lib/configure.m4 8 Sep 2005 08:18:40 -0000
@@ -327,7 +327,7 @@ LYXRC_PROG([for ChkTeX], \chktex_command
"chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38")
# Search for a spellchecker
-LYXRC_PROG([for a spell-checker], \spell_command, ispell)
+LYXRC_PROG([for a spellchecker], \spell_command, ispell)
# Search for computer algebra systems
SEARCH_PROG([for Octave],OCTAVE,octave)
Index: lib/lyxrc.example
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/lyxrc.example,v
retrieving revision 1.42
diff -u -p -r1.42 lyxrc.example
--- lib/lyxrc.example 22 Mar 2004 16:22:52 -0000 1.42
+++ lib/lyxrc.example 8 Sep 2005 08:18:40 -0000
@@ -479,7 +479,7 @@
# SPELLCHECKER SECTION ####################################################
#
-# What command runs the spell checker? Default is "ispell" if it is
+# What command runs the spellchecker? Default is "ispell" if it is
# installed, "none" otherwise.
# If you have aspell (http://metalab.unc.edu/kevina/aspell/)
# installed and configured, you might want to uncomment the line below.
Index: lib/doc/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/ChangeLog,v
retrieving revision 1.32
diff -u -p -r1.32 ChangeLog
--- lib/doc/ChangeLog 18 Jul 2005 22:38:10 -0000 1.32
+++ lib/doc/ChangeLog 8 Sep 2005 08:18:41 -0000
@@ -1,4 +1,9 @@
+2005-09-08 Angus Leeming <[EMAIL PROTECTED]>
+
+ * UserGuide.lyx: correct grammar describing invocation of the
+ spellchecker.
+
2005-07-18 José Matos <[EMAIL PROTECTED]>
* fr_UserGuide.lyx: fix wrong convertion of \lang french.
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.2270
diff -u -p -r1.2270 ChangeLog
--- src/ChangeLog 7 Sep 2005 10:36:57 -0000 1.2270
+++ src/ChangeLog 8 Sep 2005 08:19:03 -0000
@@ -1,3 +1,9 @@
+2005-09-08 Angus Leeming <[EMAIL PROTECTED]>
+
+ * ispell.C:
+ * lyxrc.C: correct grammar describing invocation of the
+ spellchecker.
+
2005-08-03 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* text.C (read): remove unused variable.
Index: src/SpellBase.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/SpellBase.h,v
retrieving revision 1.10
diff -u -p -r1.10 SpellBase.h
--- src/SpellBase.h 2 May 2005 13:35:29 -0000 1.10
+++ src/SpellBase.h 8 Sep 2005 08:19:03 -0000
@@ -19,7 +19,7 @@ class BufferParams;
class WordLangTuple;
/**
- * Base class of all spell checker implementations.
+ * Base class of all spellchecker implementations.
* The class can be instantiated but will have no functionality.
*/
class SpellBase {
Index: src/ispell.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ispell.C,v
retrieving revision 1.26
diff -u -p -r1.26 ispell.C
--- src/ispell.C 26 Apr 2005 10:30:21 -0000 1.26
+++ src/ispell.C 8 Sep 2005 08:19:03 -0000
@@ -265,7 +265,7 @@ ISpell::ISpell(BufferParams const & para
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 ?");
}
@@ -374,7 +374,7 @@ enum ISpell::Result ISpell::check(WordLa
bool error = select(err_read);
if (error) {
- error_ = _("Could not communicate with the spell-checker program.");
+ error_ = _("Could not communicate with the ispell spellchecker process.");
return UNKNOWN_WORD;
}
Index: src/lyxrc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxrc.C,v
retrieving revision 1.192
diff -u -p -r1.192 lyxrc.C
--- src/lyxrc.C 16 Jul 2005 16:57:53 -0000 1.192
+++ src/lyxrc.C 8 Sep 2005 08:19:06 -0000
@@ -2390,7 +2390,7 @@ string const LyXRC::getDescription(LyXRC
break;
case RC_SPELL_COMMAND:
- str = _("What command runs the spell checker?");
+ str = _("What command runs the spellchecker?");
break;
case RC_TEMPDIRPATH:
@@ -2418,7 +2418,7 @@ string const LyXRC::getDescription(LyXRC
break;
case RC_USE_INP_ENC:
- str = _("Specify whether to pass the -T input encoding option to ispell. Enable this if you can't spellcheck words with international letters in them. This may not work with all dictionaries.");
+ str = _("Specify whether to pass the -T input encoding option to ispell. Enable this if you cannot check the spelling of words containing accented letters. This may not work with all dictionaries.");
break;
case RC_USE_SPELL_LIB:
Index: src/frontends/controllers/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ChangeLog,v
retrieving revision 1.495
diff -u -p -r1.495 ChangeLog
--- src/frontends/controllers/ChangeLog 7 Sep 2005 09:01:15 -0000 1.495
+++ src/frontends/controllers/ChangeLog 8 Sep 2005 08:19:10 -0000
@@ -1,3 +1,8 @@
+2005-09-08 Angus Leeming <[EMAIL PROTECTED]>
+
+ * ControlSpellchecker.C: correct grammar describing invocation of the
+ spellchecker.
+
2005-08-10 Angus Leeming <[EMAIL PROTECTED]>
* tex_helpers.C (rescanTexStyles): Quote the path to TeXFiles.sh
Index: src/frontends/controllers/ControlSpellchecker.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlSpellchecker.C,v
retrieving revision 1.84
diff -u -p -r1.84 ControlSpellchecker.C
--- src/frontends/controllers/ControlSpellchecker.C 4 Aug 2005 12:51:43 -0000 1.84
+++ src/frontends/controllers/ControlSpellchecker.C 8 Sep 2005 08:19:11 -0000
@@ -108,9 +108,9 @@ bool ControlSpellchecker::initialisePara
bool const success = speller_->error().empty();
if (!success) {
- Alert::error(_("Spell-checker error"),
- _("The spell-checker could not be started")
- + '\n' + speller_->error());
+ Alert::error(_("Spellchecker error"),
+ _("The spellchecker could not be started\n")
+ + speller_->error());
speller_.reset(0);
}
@@ -185,7 +185,7 @@ WordLangTuple nextWord(DocIterator & cur
void ControlSpellchecker::check()
{
- lyxerr[Debug::GUI] << "spell check a word" << endl;
+ lyxerr[Debug::GUI] << "Check the spelling of a word" << endl;
SpellBase::Result res = SpellBase::OK;
@@ -262,15 +262,15 @@ bool ControlSpellchecker::checkAlive()
string message;
if (speller_->error().empty())
- message = _("The spell-checker has died for some reason.\n"
+ message = _("The spellchecker has died for some reason.\n"
"Maybe it has been killed.");
else
- message = _("The spell-checker has failed.")
- + '\n' + speller_->error();
+ message = _("The spellchecker has failed.\n")
+ + speller_->error();
dialog().CancelButton();
- Alert::error(_("Spell-checker error"), message);
+ Alert::error(_("The spellchecker has failed"), message);
return false;
}
@@ -289,7 +289,7 @@ void ControlSpellchecker::showSummary()
message = _("One word checked.");
dialog().CancelButton();
- Alert::information(_("Spell-checking is complete"), message);
+ Alert::information(_("Spelling check completed"), message);
}
Index: src/frontends/gtk/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/ChangeLog,v
retrieving revision 1.133
diff -u -p -r1.133 ChangeLog
--- src/frontends/gtk/ChangeLog 5 Aug 2005 07:20:38 -0000 1.133
+++ src/frontends/gtk/ChangeLog 8 Sep 2005 08:19:12 -0000
@@ -1,3 +1,8 @@
+2005-09-08 Angus Leeming <[EMAIL PROTECTED]>
+
+ * GSpellchecker.C: correct grammar describing invocation of the
+ spellchecker.
+
2005-07-05 John Spray <[EMAIL PROTECTED]>
* GRef.[Ch], glade/ref.glade: Add the reference insertion dialog
* Dialogs.C, Makefile.am, glade/Makefile.am: Use GRef
Index: src/frontends/gtk/GSpellchecker.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gtk/GSpellchecker.C,v
retrieving revision 1.6
diff -u -p -r1.6 GSpellchecker.C
--- src/frontends/gtk/GSpellchecker.C 29 Jan 2005 15:09:14 -0000 1.6
+++ src/frontends/gtk/GSpellchecker.C 8 Sep 2005 08:19:12 -0000
@@ -32,7 +32,7 @@ namespace frontend {
GSpellchecker::GSpellchecker(Dialog & parent)
: GViewCB<ControlSpellchecker, GViewGladeB>
- (parent, _("Spell-check document"), false)
+ (parent, _("Spellchecker"), false)
{}
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.817
diff -u -p -r1.817 ChangeLog
--- src/frontends/qt2/ChangeLog 19 Aug 2005 17:17:22 -0000 1.817
+++ src/frontends/qt2/ChangeLog 8 Sep 2005 08:19:17 -0000
@@ -1,3 +1,10 @@
+2005-09-08 Angus Leeming <[EMAIL PROTECTED]>
+
+ * QPrefsDialog.C:
+ * ui/QPrefSpellcheckerModule.ui:
+ * ui/QSpellcheckerDialogBase.ui: correct grammar describing invocation
+ of the spellchecker.
+
2005-08-19 Michael Schmitt <[EMAIL PROTECTED]>
* ui/QPreambleDialogBase.ui: remove obsolete file
Index: src/frontends/qt2/QPrefsDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefsDialog.C,v
retrieving revision 1.54
diff -u -p -r1.54 QPrefsDialog.C
--- src/frontends/qt2/QPrefsDialog.C 22 Jul 2005 13:44:50 -0000 1.54
+++ src/frontends/qt2/QPrefsDialog.C 8 Sep 2005 08:19:19 -0000
@@ -102,7 +102,7 @@ QPrefsDialog::QPrefsDialog(QPrefs * form
string const ls = _("Language settings");
prefsPS->addCategory(ls);
prefsPS->addPanel(languageModule, _("Language"), ls);
- prefsPS->addPanel(spellcheckerModule, _("Spell-checker"), ls);
+ prefsPS->addPanel(spellcheckerModule, _("Spellchecker"), ls);
string const op = _("Outputs");
prefsPS->addCategory(op);
Index: src/frontends/qt2/ui/QPrefSpellcheckerModule.ui
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui,v
retrieving revision 1.8
diff -u -p -r1.8 QPrefSpellcheckerModule.ui
--- src/frontends/qt2/ui/QPrefSpellcheckerModule.ui 7 May 2005 12:12:25 -0000 1.8
+++ src/frontends/qt2/ui/QPrefSpellcheckerModule.ui 8 Sep 2005 08:19:20 -0000
@@ -53,7 +53,7 @@
</property>
<property stdset="1">
<name>text</name>
- <string>Spell chec&ker:</string>
+ <string>Spellchec&ker executable:</string>
</property>
<property>
<name>buddy</name>
Index: src/frontends/qt2/ui/QSpellcheckerDialogBase.ui
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/QSpellcheckerDialogBase.ui,v
retrieving revision 1.5
diff -u -p -r1.5 QSpellcheckerDialogBase.ui
--- src/frontends/qt2/ui/QSpellcheckerDialogBase.ui 7 May 2005 12:12:25 -0000 1.5
+++ src/frontends/qt2/ui/QSpellcheckerDialogBase.ui 8 Sep 2005 08:19:21 -0000
@@ -149,7 +149,7 @@
</property>
<property>
<name>toolTip</name>
- <string>How far spellchecking has got</string>
+ <string>Proportion of document checked</string>
</property>
</widget>
<widget row="5" column="0" rowspan="4" colspan="2" >
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.1002
diff -u -p -r1.1002 ChangeLog
--- src/frontends/xforms/ChangeLog 28 Jul 2005 10:26:32 -0000 1.1002
+++ src/frontends/xforms/ChangeLog 8 Sep 2005 08:19:26 -0000
@@ -1,3 +1,10 @@
+2005-09-08 Angus Leeming <[EMAIL PROTECTED]>
+
+ * FormPreferences.C:
+ * FormSpellchecker.C:
+ * forms/form_preferences.fd: correct grammar describing invocation
+ of the spellchecker.
+
2005-07-28 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* FormDialogView.C (show): exit after update if Controller::exitEarly()
Index: src/frontends/xforms/FormPreferences.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormPreferences.C,v
retrieving revision 1.201
diff -u -p -r1.201 FormPreferences.C
--- src/frontends/xforms/FormPreferences.C 17 Jul 2005 12:39:55 -0000 1.201
+++ src/frontends/xforms/FormPreferences.C 8 Sep 2005 08:19:30 -0000
@@ -267,7 +267,7 @@ void FormPreferences::build()
// then building usage
fl_addto_tabfolder(lang_opts_tab_->tabfolder_inner,
- _("Spell checker").c_str(),
+ _("Spellchecker").c_str(),
spelloptions_.dialog()->form);
fl_addto_tabfolder(lang_opts_tab_->tabfolder_inner,
_("Language").c_str(),
@@ -2926,7 +2926,7 @@ void FormPreferences::SpellOptions::appl
rc.isp_command = choice;
#if 0
- // If spell checker == "none", all other input set to off.
+ // If spellchecker == "none", all other input set to off.
if (fl_get_choice(dialog_->choice_spell_command) == 1) {
rc.isp_use_alt_lang = false;
rc.isp_alt_lang.erase();
@@ -3040,7 +3040,7 @@ bool FormPreferences::SpellOptions::inpu
// otherwise the function is called by an xforms CB via input().
#if 0
- // If spell checker == "none", disable all input.
+ // If spellchecker == "none", disable all input.
if (!ob || ob == dialog_->choice_spell_command) {
if (fl_get_choice(dialog_->choice_spell_command) == 1) {
fl_deactivate_object(dialog_->check_alt_lang);
Index: src/frontends/xforms/FormSpellchecker.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormSpellchecker.C,v
retrieving revision 1.45
diff -u -p -r1.45 FormSpellchecker.C
--- src/frontends/xforms/FormSpellchecker.C 5 May 2005 11:07:45 -0000 1.45
+++ src/frontends/xforms/FormSpellchecker.C 8 Sep 2005 08:19:30 -0000
@@ -73,7 +73,7 @@ void FormSpellchecker::build()
tooltips().init(dialog_->button_accept, str);
str = _("Add unknown word to personal dictionary.");
tooltips().init(dialog_->button_add, str);
- str = _("Shows word count and progress on spell check.");
+ str = _("Proportion of document checked.");
tooltips().init(dialog_->slider_progress, str);
}
Index: src/frontends/xforms/forms/form_preferences.fd
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/forms/form_preferences.fd,v
retrieving revision 1.75
diff -u -p -r1.75 form_preferences.fd
--- src/frontends/xforms/forms/form_preferences.fd 17 Jul 2005 12:39:56 -0000 1.75
+++ src/frontends/xforms/forms/form_preferences.fd 8 Sep 2005 08:19:32 -0000
@@ -1111,7 +1111,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
-label: Spell command:|#S
+label: Spellchecker executable:|#S
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
