#include "LyX.h"
+#include "AppleSpellChecker.h"
#include "AspellChecker.h"
#include "Buffer.h"
#include "BufferList.h"
#include "ConverterCache.h"
#include "Converter.h"
#include "CutAndPaste.h"
+#include "EnchantChecker.h"
#include "Encoding.h"
#include "ErrorList.h"
#include "Format.h"
#include "FuncStatus.h"
+#include "HunspellChecker.h"
#include "KeyMap.h"
#include "Language.h"
#include "LayoutFile.h"
#include "Lexer.h"
+#include "LyX.h"
#include "LyXAction.h"
-#include "LyXFunc.h"
#include "LyXRC.h"
#include "ModuleList.h"
#include "Mover.h"
#include "support/Path.h"
#include "support/Systemcall.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <boost/scoped_ptr.hpp>
#include <algorithm>
bool use_gui = true;
+
+// Tell what files can be silently overwritten during batch export.
+// 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 = UNSPECIFIED;
+
+
namespace {
// Filled with the command line arguments "foo" of "-sysdir foo" or
} // namespace anon
-
/// The main application class private implementation.
struct LyX::Impl
{
- Impl()
+ 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
// variables.
messages_["GUI"] = Messages();
-
-#if defined(USE_ASPELL)
- spell_checker_ = new AspellChecker();
-#else
- spell_checker_ = 0;
-#endif
}
~Impl()
{
- delete spell_checker_;
+ delete apple_spell_checker_;
+ delete aspell_checker_;
+ delete enchant_checker_;
+ delete hunspell_checker_;
}
- /// our function handler
- LyXFunc lyxfunc_;
///
BufferList buffer_list_;
///
graphics::Previews preview_;
///
SpellChecker * spell_checker_;
+ ///
+ SpellChecker * apple_spell_checker_;
+ ///
+ SpellChecker * aspell_checker_;
+ ///
+ SpellChecker * enchant_checker_;
+ ///
+ SpellChecker * hunspell_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(to_utf8(from_local8bit(argv[0])),
- cl_system_support, cl_user_support,
- top_build_dir_is_one_level_up);
+ init_package(os::utf8_argv(0),
+ 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
*/
// Note: socket callback must be registered after init(argc, argv)
// such that package().temp_dir() is properly initialized.
- pimpl_->lyx_server_.reset(new Server(&pimpl_->lyxfunc_, lyxrc.lyxpipes));
- pimpl_->lyx_socket_.reset(new ServerSocket(&pimpl_->lyxfunc_,
- FileName(package().temp_dir().absFilename() + "/lyxsocket")));
+ pimpl_->lyx_server_.reset(new Server(lyxrc.lyxpipes));
+ pimpl_->lyx_socket_.reset(new ServerSocket(
+ FileName(package().temp_dir().absFileName() + "/lyxsocket")));
// Start the real execution loop.
exit_status = pimpl_->application_->exec();
// do any other cleanup procedures now
if (package().temp_dir() != package().system_temp_dir()) {
- string const abs_tmpdir = package().temp_dir().absFilename();
- if (!contains(package().temp_dir().absFilename(), "lyx_tmpdir")) {
+ string const abs_tmpdir = package().temp_dir().absFileName();
+ if (!contains(package().temp_dir().absFileName(), "lyx_tmpdir")) {
docstring const msg =
bformat(_("%1$s does not appear like a LyX created temporary directory."),
from_utf8(abs_tmpdir));
Alert::warning(_("Cannot remove temporary directory"), msg);
} else {
LYXERR(Debug::INFO, "Deleting tmp dir "
- << package().temp_dir().absFilename());
+ << package().temp_dir().absFileName());
if (!package().temp_dir().destroyDirectory()) {
docstring const msg =
bformat(_("Unable to remove the temporary directory %1$s"),
- from_utf8(package().temp_dir().absFilename()));
+ from_utf8(package().temp_dir().absFileName()));
Alert::warning(_("Unable to remove temporary directory"), msg);
}
}
if (argv[argi][0] == '-') {
lyxerr << to_utf8(
bformat(_("Wrong command line option `%1$s'. Exiting."),
- from_utf8(argv[argi]))) << endl;
+ from_utf8(os::utf8_argv(argi)))) << endl;
return EXIT_FAILURE;
}
}
return EXIT_FAILURE;
// Remaining arguments are assumed to be files to load.
- for (int argi = argc - 1; argi >= 1; --argi)
- pimpl_->files_to_load_.push_back(to_utf8(from_local8bit(argv[argi])));
+ for (int argi = 1; argi < argc; ++argi)
+ pimpl_->files_to_load_.push_back(os::utf8_argv(argi));
if (first_start) {
pimpl_->files_to_load_.push_back(
- i18nLibFileSearch("examples", "splash.lyx").absFilename());
+ i18nLibFileSearch("examples", "splash.lyx").absFileName());
}
return EXIT_SUCCESS;
if (fname.empty())
continue;
- Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFilename(), false);
- if (buf->loadLyXFile(fname)) {
+ Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName(), false);
+ if (buf->loadLyXFile(fname) == Buffer::ReadSuccess) {
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);
// aknowledged.
// if reconfiguration is needed.
- while (LayoutFileList::get().empty()) {
+ if (LayoutFileList::get().empty()) {
switch (Alert::prompt(
_("No textclass is found"),
- _("LyX cannot continue because no textclass is found. "
- "You can either reconfigure normally, or reconfigure using "
- "default textclasses, or quit LyX."),
+ _("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,
_("&Reconfigure"),
- _("&Use Default"),
- _("&Exit LyX")))
+ _("&Use Defaults"),
+ _("&Continue")))
{
case 0:
// regular reconfigure
- pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_RECONFIGURE, ""));
+ lyx::dispatch(FuncRequest(LFUN_RECONFIGURE, ""));
break;
case 1:
// reconfigure --without-latex-config
- pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_RECONFIGURE,
+ lyx::dispatch(FuncRequest(LFUN_RECONFIGURE,
" --without-latex-config"));
break;
default:
- pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_LYX_QUIT));
- return;
+ break;
}
}
-
+
// create the first main window
- pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg));
+ lyx::dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg));
if (!pimpl_->files_to_load_.empty()) {
// if some files were specified at command-line we assume that the
// user wants to edit *these* files and not to restore the session.
for (size_t i = 0; i != pimpl_->files_to_load_.size(); ++i) {
- pimpl_->lyxfunc_.dispatch(
+ lyx::dispatch(
FuncRequest(LFUN_FILE_OPEN, pimpl_->files_to_load_[i]));
}
// clear this list to save a few bytes of RAM
vector<string>::const_iterator bcend = pimpl_->batch_commands.end();
for (; bcit != bcend; bcit++) {
LYXERR(Debug::INIT, "About to handle -x '" << *bcit << '\'');
- pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(*bcit));
+ lyx::dispatch(lyxaction.lookupFunc(*bcit));
}
}
// This shouldn't matter here, however, as we've already invoked
// emergencyCleanup.
+ docstring msg;
switch (err_sig) {
#ifdef SIGHUP
case SIGHUP:
- lyxerr << "\nlyx: SIGHUP signal caught\nBye." << endl;
+ msg = _("SIGHUP signal caught!\nBye.");
break;
#endif
case SIGFPE:
- lyxerr << "\nlyx: SIGFPE signal caught\nBye." << endl;
+ msg = _("SIGFPE signal caught!\nBye.");
break;
case SIGSEGV:
- lyxerr << "\nlyx: SIGSEGV signal caught\n"
- "Sorry, you have found a bug in LyX. "
+ msg = _("SIGSEGV signal caught!\n"
+ "Sorry, you have found a bug in LyX, "
+ "hope you have not lost any data.\n"
"Please read the bug-reporting instructions "
- "in Help->Introduction and send us a bug report, "
- "if necessary. Thanks !\nBye." << endl;
+ "in 'Help->Introduction' and send us a bug report, "
+ "if necessary. Thanks !\nBye.");
break;
case SIGINT:
case SIGTERM:
break;
}
+ if (!msg.empty()) {
+ lyxerr << "\nlyx: " << msg << endl;
+ // try to make a GUI message
+ Alert::error(_("LyX crashed!"), msg);
+ }
+
// Deinstall the signal handlers
#ifdef SIGHUP
signal(SIGHUP, SIG_DFL);
#ifdef SIGHUP
if (err_sig == SIGSEGV ||
- (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty()))
+ (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty())) {
#else
- if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty())
+ if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) {
#endif
+#ifdef _MSC_VER
+ // with abort() it crashes again.
+ exit(err_sig);
+#else
abort();
+#endif
+ }
+
exit(0);
}
signal(SIGTERM, error_handler);
// SIGPIPE can be safely ignored.
- lyxrc.tempdir_path = package().temp_dir().absFilename();
- lyxrc.document_path = package().document_dir().absFilename();
+ lyxrc.tempdir_path = package().temp_dir().absFileName();
+ lyxrc.document_path = package().document_dir().absFileName();
if (lyxrc.example_path.empty()) {
- lyxrc.example_path = addPath(package().system_support().absFilename(),
+ lyxrc.example_path = addPath(package().system_support().absFileName(),
"examples");
}
if (lyxrc.template_path.empty()) {
- lyxrc.template_path = addPath(package().system_support().absFilename(),
+ lyxrc.template_path = addPath(package().system_support().absFileName(),
"templates");
}
// Add the directory containing the LyX executable to the path
// so that LyX can find things like tex2lyx.
if (package().build_support().empty())
- prependEnvPath("PATH", package().binary_dir().absFilename());
+ prependEnvPath("PATH", package().binary_dir().absFileName());
#endif
if (!lyxrc.path_prefix.empty())
prependEnvPath("PATH", lyxrc.path_prefix);
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 the language defined by the user.
setRcGuiLanguage();
- // Load the layouts
LYXERR(Debug::INIT, "Reading layouts...");
- if (!LyXSetStyle())
- return false;
+ // Load the layouts
+ LayoutFileList::get().read();
//...and the modules
- moduleList.read();
+ theModuleList.read();
// read keymap and ui files in batch mode as well
// because InsetInfo needs to know these to produce
// 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);
// load user bind file user.bind
pimpl_->toplevel_keymap_.read("user", 0, KeyMap::MissingOK);
- pimpl_->lyxfunc_.initKeySequences(&pimpl_->toplevel_keymap_);
-
if (lyxerr.debugging(Debug::LYXRC))
lyxrc.print();
}
LYXERR(Debug::INIT, "LyX tmp dir: `"
- << package().temp_dir().absFilename() << '\'');
+ << package().temp_dir().absFileName() << '\'');
LYXERR(Debug::INIT, "Reading session information '.lyx/session'...");
pimpl_->session_.reset(new Session(lyxrc.num_lastfiles));
// 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;
}
static bool firstrun = true;
if (firstrun) {
configure_script =
- FileName(addName(package().system_support().absFilename(),
+ FileName(addName(package().system_support().absFileName(),
"configure.py"));
firstrun = false;
}
- FileName absfile =
- FileName(addName(package().user_support().absFilename(), file));
+ FileName absfile =
+ FileName(addName(package().user_support().absFileName(), file));
return !absfile.exists()
|| configure_script.lastModified() > absfile.lastModified();
}
bformat(_("You have specified a non-existent user "
"LyX directory, %1$s.\n"
"It is needed to keep your own configuration."),
- from_utf8(package().user_support().absFilename())),
+ from_utf8(package().user_support().absFileName())),
1, 0,
_("&Create directory"),
_("&Exit LyX"))) {
}
lyxerr << to_utf8(bformat(_("LyX: Creating directory %1$s"),
- from_utf8(sup.absFilename()))) << endl;
+ from_utf8(sup.absFileName()))) << endl;
if (!sup.createDirectory(0755)) {
// Failed, so let's exit.
}
lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl;
- lyxerr.level(Debug::value(arg));
+ lyxerr.setLevel(Debug::value(arg));
Debug::showLevel(lyxerr, lyxerr.level());
return 1;
}
"\t-i [--import] fmt file.xxx\n"
" where fmt is the import format of choice\n"
" and file.xxx is the file to be imported.\n"
- "\t--batch execute commands and exit\n"
+ "\t-f [--force-overwrite] what\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"
"Check the LyX man page for more details.")) << endl;
exit(0);
}
-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 &)
+{
+ if (arg == "all") {
+ force_overwrite = ALL_FILES;
+ return 1;
+ } 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;
+}
+
+
} // namespace anon
cmdmap["-i"] = parse_import;
cmdmap["--import"] = parse_import;
cmdmap["-geometry"] = parse_geometry;
- cmdmap["--batch"] = parse_batch;
+ cmdmap["-batch"] = parse_batch;
+ cmdmap["-f"] = parse_force;
+ cmdmap["--force-overwrite"] = parse_force;
for (int i = 1; i < argc; ++i) {
map<string, cmd_helper>::const_iterator it
continue;
string const arg =
- (i + 1 < argc) ? to_utf8(from_local8bit(argv[i + 1])) : string();
+ (i + 1 < argc) ? os::utf8_argv(i + 1) : string();
string const arg2 =
- (i + 2 < argc) ? to_utf8(from_local8bit(argv[i + 2])) : string();
+ (i + 2 < argc) ? os::utf8_argv(i + 2) : string();
string batch;
int const remove = 1 + it->second(arg, arg2, batch);
// Now, remove used arguments by shifting
// the following ones remove places down.
if (remove > 0) {
+ os::remove_internal_args(i, remove);
argc -= remove;
for (int j = i; j < argc; ++j)
argv[j] = argv[j + remove];
FuncStatus getStatus(FuncRequest const & action)
{
- LASSERT(singleton_, /**/);
- return singleton_->pimpl_->lyxfunc_.getStatus(action);
+ LASSERT(theApp(), /**/);
+ return theApp()->getStatus(action);
}
void dispatch(FuncRequest const & action)
{
- LASSERT(singleton_, /**/);
- singleton_->pimpl_->lyxfunc_.dispatch(action);
+ LASSERT(theApp(), /**/);
+ return theApp()->dispatch(action);
}
-BufferList & theBufferList()
+void dispatch(FuncRequest const & action, DispatchResult & dr)
{
- LASSERT(singleton_, /**/);
- return singleton_->pimpl_->buffer_list_;
+ LASSERT(theApp(), /**/);
+ return theApp()->dispatch(action, dr);
}
-LyXFunc & theLyXFunc()
+BufferList & theBufferList()
{
LASSERT(singleton_, /**/);
- return singleton_->pimpl_->lyxfunc_;
+ return singleton_->pimpl_->buffer_list_;
}
}
-Messages & getMessages(string const & language)
+Messages const & getMessages(string const & language)
{
LASSERT(singleton_, /**/);
return singleton_->messages(language);
}
-Messages & getGuiMessages()
+Messages const & getGuiMessages()
{
LASSERT(singleton_, /**/);
return singleton_->pimpl_->messages_["GUI"];
SpellChecker * theSpellChecker()
{
+ if (!singleton_->pimpl_->spell_checker_)
+ setSpellChecker();
return singleton_->pimpl_->spell_checker_;
}
+
+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 (!singleton_->pimpl_->aspell_checker_)
+ singleton_->pimpl_->aspell_checker_ = new AspellChecker();
+ singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->aspell_checker_;
+#else
+ singleton_->pimpl_->spell_checker_ = 0;
+#endif
+ } else if (lyxrc.spellchecker == "enchant") {
+#if defined(USE_ENCHANT)
+ if (!singleton_->pimpl_->enchant_checker_)
+ singleton_->pimpl_->enchant_checker_ = new EnchantChecker();
+ singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->enchant_checker_;
+#else
+ singleton_->pimpl_->spell_checker_ = 0;
+#endif
+ } else if (lyxrc.spellchecker == "hunspell") {
+#if defined(USE_HUNSPELL)
+ if (!singleton_->pimpl_->hunspell_checker_)
+ singleton_->pimpl_->hunspell_checker_ = new HunspellChecker();
+ singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->hunspell_checker_;
+#else
+ singleton_->pimpl_->spell_checker_ = 0;
+#endif
+ } 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