anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 21:55:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure that the grammar used to invoke the spellchecker is consistent.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10425 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-09-08 09:20:16 +00:00
parent 52a2eb2c52
commit 251f834995
22 changed files with 72 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-08 Angus Leeming <leeming@lyx.org>
* spell.m4: correct grammar describing invocation of the
spellchecker.
2005-07-18 Lars Gullik Bjønnes <larsbj@lyx.org>
* common.am (AUTOMAKE_OPTIONS): add dist-bzip2

2
config/spell.m4
View File

@ -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)

6
lib/ChangeLog
View File

@ -1,3 +1,9 @@
2005-09-08 Angus Leeming <leeming@lyx.org>
* configure.m4:
* lyxrc.example: correct grammar describing invocation of the
spellchecker.
2005-09-06 Michael Gerz <michael.gerz@teststep.org>
* CREDITS:

2
lib/configure.m4
View File

@ -327,7 +327,7 @@ LYXRC_PROG([for ChkTeX], \chktex_command,dnl
"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)

5
lib/doc/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-08 Angus Leeming <leeming@lyx.org>
* UserGuide.lyx: correct grammar describing invocation of the
spellchecker.
2005-07-18 José Matos <jamatos@lyx.org>
* fr_UserGuide.lyx: fix wrong convertion of \lang french.

2
lib/lyxrc.example
View File

@ -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.

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2005-09-08 Angus Leeming <leeming@lyx.org>
* ispell.C:
* lyxrc.C: correct grammar describing invocation of the
spellchecker.
2005-08-03 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* text.C (read): remove unused variable.

2
src/SpellBase.h
View File

@ -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 {

5
src/frontends/controllers/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-08 Angus Leeming <leeming@lyx.org>
* ControlSpellchecker.C: correct grammar describing invocation of the
spellchecker.
2005-08-10 Angus Leeming <leeming@lyx.org>
* tex_helpers.C (rescanTexStyles): Quote the path to TeXFiles.sh

18
src/frontends/controllers/ControlSpellchecker.C
View File

@ -108,9 +108,9 @@ bool ControlSpellchecker::initialiseParams(std::string const &)
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, ptrdiff_t & progress,
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);
}

5
src/frontends/gtk/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-08 Angus Leeming <leeming@lyx.org>
* GSpellchecker.C: correct grammar describing invocation of the
spellchecker.
2005-07-05 John Spray <spray@lyx.org>
* GRef.[Ch], glade/ref.glade: Add the reference insertion dialog
* Dialogs.C, Makefile.am, glade/Makefile.am: Use GRef

2
src/frontends/gtk/GSpellchecker.C
View File

@ -32,7 +32,7 @@ namespace frontend {
GSpellchecker::GSpellchecker(Dialog & parent)
: GViewCB<ControlSpellchecker, GViewGladeB>
(parent, _("Spell-check document"), false)
(parent, _("Spellchecker"), false)
{}

7
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,10 @@
2005-09-08 Angus Leeming <leeming@lyx.org>
* QPrefsDialog.C:
* ui/QPrefSpellcheckerModule.ui:
* ui/QSpellcheckerDialogBase.ui: correct grammar describing invocation
of the spellchecker.
2005-08-19 Michael Schmitt <michael.schmitt@teststep.org>
* ui/QPreambleDialogBase.ui: remove obsolete file

2
src/frontends/qt2/QPrefsDialog.C
View File

@ -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);

2
src/frontends/qt2/ui/QPrefSpellcheckerModule.ui
View File

@ -53,7 +53,7 @@
</property>
<property stdset="1">
<name>text</name>
<string>Spell chec&amp;ker:</string>
<string>Spellchec&amp;ker executable:</string>
</property>
<property>
<name>buddy</name>

2
src/frontends/qt2/ui/QSpellcheckerDialogBase.ui
View File

@ -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" >

7
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,10 @@
2005-09-08 Angus Leeming <leeming@lyx.org>
* FormPreferences.C:
* FormSpellchecker.C:
* forms/form_preferences.fd: correct grammar describing invocation
of the spellchecker.
2005-07-28 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* FormDialogView.C (show): exit after update if Controller::exitEarly()

6
src/frontends/xforms/FormPreferences.C
View File

@ -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::apply(LyXRC & rc)
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::input(FL_OBJECT const * const ob)
// 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);

2
src/frontends/xforms/FormSpellchecker.C
View File

@ -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);
}

2
src/frontends/xforms/forms/form_preferences.fd
View File

@ -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

4
src/ispell.C
View File

@ -265,7 +265,7 @@ ISpell::ISpell(BufferParams const & params, string const & lang)
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(WordLangTuple const & word)
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;
}

4
src/lyxrc.C
View File

@ -2390,7 +2390,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
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(LyXRCTags tag)
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: