#include "LyX.h"
+#include "AppleSpellChecker.h"
#include "AspellChecker.h"
#include "Buffer.h"
#include "BufferList.h"
#include "support/Path.h"
#include "support/Systemcall.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <boost/scoped_ptr.hpp>
#include <algorithm>
// Tell what files can be silently overwritten during batch export.
-// Possible values are: NO_FILES, MAIN_FILE, ALL_FILES.
+// Possible values are: NO_FILES, MAIN_FILE, ALL_FILES, UNSPECIFIED.
+// Unless specified on command line (through the -f switch) or through the
+// environment variable LYX_FORCE_OVERWRITE, the default will be MAIN_FILE.
-OverwriteFiles force_overwrite = NO_FILES;
+OverwriteFiles force_overwrite = UNSPECIFIED;
namespace {
/// The main application class private implementation.
struct LyX::Impl
{
- Impl() : spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0)
+ Impl() : spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0)
{
// Set the default User Interface language as soon as possible.
// The language used will be derived from the environment
~Impl()
{
+ delete apple_spell_checker_;
delete aspell_checker_;
delete enchant_checker_;
delete hunspell_checker_;
///
SpellChecker * spell_checker_;
///
+ SpellChecker * apple_spell_checker_;
+ ///
SpellChecker * aspell_checker_;
///
SpellChecker * enchant_checker_;
LyX::~LyX()
{
- singleton_ = 0;
delete pimpl_;
+ singleton_ = 0;
}
int LyX::exec(int & argc, char * argv[])
{
+ // Minimal setting of locale before parsing command line
+ try {
+ init_package(os::utf8_argv(0), string(), string(),
+ top_build_dir_is_one_level_up);
+ } catch (ExceptionMessage const & message) {
+ LYXERR(Debug::LOCALE, message.title_ + ", " + message.details_);
+ }
+ // FIXME: This breaks out of source build under Windows.
+ locale_init();
+
// Here we need to parse the command line. At least
// we need to parse for "-dbg" and "-help"
easyParse(argc, argv);
try {
init_package(os::utf8_argv(0),
- cl_system_support, cl_user_support,
- top_build_dir_is_one_level_up);
+ cl_system_support, cl_user_support,
+ top_build_dir_is_one_level_up);
} catch (ExceptionMessage const & message) {
if (message.type_ == ErrorException) {
Alert::error(message.title_, message.details_);
prepareExit();
return exit_status;
}
-
+
// FIXME
/* Create a CoreApplication class that will provide the main event loop
* and the socket callback registering. With Qt4, only QtCore
return EXIT_FAILURE;
// Remaining arguments are assumed to be files to load.
- for (int argi = argc - 1; argi >= 1; --argi)
+ for (int argi = 1; argi < argc; ++argi)
pimpl_->files_to_load_.push_back(os::utf8_argv(argi));
if (first_start) {
ErrorList const & el = buf->errorList("Parse");
if (!el.empty())
for_each(el.begin(), el.end(),
- boost::bind(&LyX::printError, this, _1));
+ bind(&LyX::printError, this, _1));
}
else {
pimpl_->buffer_list_.release(buf);
if (LayoutFileList::get().empty()) {
switch (Alert::prompt(
_("No textclass is found"),
- _("LyX will have minimal functionality because no textclasses "
+ _("LyX will only have minimal functionality because no textclasses "
"have been found. You can either try to reconfigure LyX normally, "
"try to reconfigure using only the defaults, or continue."),
0, 2,
break;
}
}
-
+
// create the first main window
lyx::dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg));
(err_sig != SIGHUP && !getEnv("LYXDEBUG").empty())) {
#else
if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) {
-#endif
+#endif
#ifdef _MSC_VER
// with abort() it crashes again.
exit(err_sig);
if (queryUserLyXDir(package().explicit_user_support()))
reconfigureUserLyXDir();
- // no need for a splash when there is no GUI
if (!use_gui) {
+ // No need for a splash when there is no GUI
first_start = false;
+ // Default is to overwrite the main file during export, unless
+ // the -f switch was specified or LYX_FORCE_OVERWRITE was set
+ if (force_overwrite == UNSPECIFIED) {
+ string const what = getEnv("LYX_FORCE_OVERWRITE");
+ if (what == "all")
+ force_overwrite = ALL_FILES;
+ else if (what == "none")
+ force_overwrite = NO_FILES;
+ else
+ force_overwrite = MAIN_FILE;
+ }
}
// This one is generated in user_support directory by lib/configure.py.
// Set up command definitions
pimpl_->toplevel_cmddef_.read(lyxrc.def_file);
+ // FIXME
// Set up bindings
pimpl_->toplevel_keymap_.read("site");
pimpl_->toplevel_keymap_.read(lyxrc.bind_file);
// This must happen after package initialization and after lyxrc is
// read, therefore it can't be done by a static object.
ConverterCache::init();
-
+
return true;
}
firstrun = false;
}
- FileName absfile =
+ FileName absfile =
FileName(addName(package().user_support().absFileName(), file));
return !absfile.exists()
|| configure_script.lastModified() > absfile.lastModified();
" where fmt is the import format of choice\n"
" and file.xxx is the file to be imported.\n"
"\t-f [--force-overwrite] what\n"
- " where what is either `all' or `main'.\n"
- " Using `all', all files are overwritten during\n"
- " a batch export, otherwise only the main file will be.\n"
+ " where what is either `all', `main' or `none',\n"
+ " specifying whether all files, main file only, or no files,\n"
+ " respectively, are to be overwritten during a batch export.\n"
" Anything else is equivalent to `all', but is not consumed.\n"
"\t-batch execute commands without launching GUI and exit.\n"
"\t-version summarize version and build info\n"
}
-int parse_batch(string const &, string const &, string &)
+int parse_batch(string const &, string const &, string &)
{
use_gui = false;
return 0;
}
-int parse_force(string const & arg, string const &, string &)
+int parse_force(string const & arg, string const &, string &)
{
if (arg == "all") {
force_overwrite = ALL_FILES;
} else if (arg == "main") {
force_overwrite = MAIN_FILE;
return 1;
+ } else if (arg == "none") {
+ force_overwrite = NO_FILES;
+ return 1;
}
force_overwrite = ALL_FILES;
return 0;
void setSpellChecker()
{
+ SpellChecker::ChangeNumber speller_change_number =singleton_->pimpl_->spell_checker_ ?
+ singleton_->pimpl_->spell_checker_->changeNumber() : 0;
+
+ if (lyxrc.spellchecker == "native") {
+#if defined(USE_MACOSX_PACKAGING)
+ if (!singleton_->pimpl_->apple_spell_checker_)
+ singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker();
+ singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->apple_spell_checker_;
+#else
+ singleton_->pimpl_->spell_checker_ = 0;
+#endif
+ } else if (lyxrc.spellchecker == "aspell") {
#if defined(USE_ASPELL)
- if (lyxrc.spellchecker == "aspell") {
if (!singleton_->pimpl_->aspell_checker_)
singleton_->pimpl_->aspell_checker_ = new AspellChecker();
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->aspell_checker_;
- return;
- }
+#else
+ singleton_->pimpl_->spell_checker_ = 0;
#endif
+ } else if (lyxrc.spellchecker == "enchant") {
#if defined(USE_ENCHANT)
- if (lyxrc.spellchecker == "enchant") {
if (!singleton_->pimpl_->enchant_checker_)
singleton_->pimpl_->enchant_checker_ = new EnchantChecker();
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->enchant_checker_;
- return;
- }
+#else
+ singleton_->pimpl_->spell_checker_ = 0;
#endif
+ } else if (lyxrc.spellchecker == "hunspell") {
#if defined(USE_HUNSPELL)
- if (lyxrc.spellchecker == "hunspell") {
if (!singleton_->pimpl_->hunspell_checker_)
singleton_->pimpl_->hunspell_checker_ = new HunspellChecker();
singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->hunspell_checker_;
- return;
- }
+#else
+ singleton_->pimpl_->spell_checker_ = 0;
#endif
- singleton_->pimpl_->spell_checker_ = 0;
+ } else {
+ singleton_->pimpl_->spell_checker_ = 0;
+ }
+ if (singleton_->pimpl_->spell_checker_) {
+ singleton_->pimpl_->spell_checker_->changeNumber(speller_change_number);
+ singleton_->pimpl_->spell_checker_->advanceChangeNumber();
+ }
}
} // namespace lyx
projects / lyx.git / blobdiff