X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=7e56d550eefbc42f1ae6e2ce825c149d075d9b55;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=7b5c07636f00556e3b9fa21e5d44ecc3a9424b2c;hpb=75f6ced64b80956a16e6e1b0557ac1263a28441d;p=lyx.git

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 7b5c07636f..7e56d550ee 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -17,6 +17,7 @@
 
 #include "LyX.h"
 
+#include "AppleSpellChecker.h"
 #include "AspellChecker.h"
 #include "Buffer.h"
 #include "BufferList.h"
@@ -25,6 +26,7 @@
 #include "ConverterCache.h"
 #include "Converter.h"
 #include "CutAndPaste.h"
+#include "EnchantChecker.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
@@ -34,20 +36,19 @@
 #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 "Server.h"
 #include "ServerSocket.h"
 #include "Session.h"
+#include "WordList.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
 
-#include "graphics/Previews.h"
-
 #include "support/lassert.h"
 #include "support/debug.h"
 #include "support/environment.h"
@@ -61,7 +62,7 @@
 #include "support/Path.h"
 #include "support/Systemcall.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 #include <boost/scoped_ptr.hpp>
 
 #include <algorithm>
@@ -87,6 +88,22 @@ namespace os = support::os;
 
 bool use_gui = true;
 
+
+// We default to open documents in an already running instance, provided that
+// the lyxpipe has been setup. This can be overridden either on the command
+// line or through preference settings.
+
+RunMode run_mode = PREFERRED;
+
+
+// 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
@@ -122,7 +139,7 @@ void reconfigureUserLyXDir()
 /// The main application class private implementation.
 struct LyX::Impl
 {
-	Impl() : spell_checker_(0), aspell_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
@@ -132,12 +149,12 @@ struct LyX::Impl
 
 	~Impl()
 	{
+		delete apple_spell_checker_;
 		delete aspell_checker_;
+		delete enchant_checker_;
 		delete hunspell_checker_;
 	}
 
-	/// our function handler
-	LyXFunc lyxfunc_;
 	///
 	BufferList buffer_list_;
 	///
@@ -175,13 +192,15 @@ struct LyX::Impl
 	/// the parsed command line batch command if any
 	vector<string> batch_commands;
 
-	///
-	graphics::Previews preview_;
 	///
 	SpellChecker * spell_checker_;
 	///
+	SpellChecker * apple_spell_checker_;
+	///
 	SpellChecker * aspell_checker_;
 	///
+	SpellChecker * enchant_checker_;
+	///
 	SpellChecker * hunspell_checker_;
 };
 
@@ -197,8 +216,9 @@ frontend::Application * theApp()
 
 LyX::~LyX()
 {
-	singleton_ = 0;
 	delete pimpl_;
+	singleton_ = 0;
+	WordList::cleanupWordLists();
 }
 
 
@@ -266,14 +286,21 @@ void setRcGuiLanguage()
 
 int LyX::exec(int & argc, char * argv[])
 {
+	// Minimal setting of locale before parsing command line
+	try {
+		init_package(os::utf8_argv(0), string(), string());
+		// we do not get to this point when init_package throws an exception
+		locale_init();
+	} catch (ExceptionMessage const & message) {
+		LYXERR(Debug::LOCALE, message.title_ + ", " + message.details_);
+	}
+
 	// 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);
 	} catch (ExceptionMessage const & message) {
 		if (message.type_ == ErrorException) {
 			Alert::error(message.title_, message.details_);
@@ -340,22 +367,37 @@ int LyX::exec(int & argc, char * argv[])
 		prepareExit();
 		return exit_status;
 	}
- 
+
+	// If not otherwise specified by a command line option or
+	// by preferences, we default to reuse a running instance.
+	if (run_mode == PREFERRED)
+		run_mode = USE_REMOTE;
+
 	// FIXME
 	/* Create a CoreApplication class that will provide the main event loop
 	* and the socket callback registering. With Qt4, only QtCore
 	* library would be needed.
 	* When this is done, a server_mode could be created and the following two
 	* line would be moved out from here.
+	* However, note that the first of the two lines below triggers the
+	* "single instance" behavior, which should occur right at this point.
 	*/
 	// 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();
+	if (!theServer().deferredLoadingToOtherInstance())
+		exit_status = pimpl_->application_->exec();
+	else if (!pimpl_->files_to_load_.empty()) {
+		vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
+		vector<string>::const_iterator end = pimpl_->files_to_load_.end();
+		lyxerr << _("The following files could not be loaded:") << endl;
+		for (; it != end; ++it)
+			lyxerr << *it << endl;
+	}
 
 	prepareExit();
 
@@ -386,19 +428,19 @@ void LyX::prepareExit()
 
 	// 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);
 			}
 		}
@@ -406,8 +448,7 @@ void LyX::prepareExit()
 
 	// Kill the application object before exiting. This avoids crashes
 	// when exiting on Linux.
-	if (pimpl_->application_)
-		pimpl_->application_.reset();
+	pimpl_->application_.reset();
 }
 
 
@@ -429,7 +470,7 @@ int LyX::init(int & argc, char * argv[])
 		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;
 		}
 	}
@@ -442,12 +483,12 @@ int LyX::init(int & argc, char * argv[])
 		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;
@@ -470,12 +511,12 @@ bool LyX::loadFiles()
 		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() == 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);
@@ -500,40 +541,39 @@ void LyX::execCommands()
 	// 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 without checking your LaTeX installation, or continue."),
 			0, 2,
 			_("&Reconfigure"),
-			_("&Use Default"),
-			_("&Exit LyX")))
+			_("&Without LaTeX"),
+			_("&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
@@ -549,7 +589,7 @@ void LyX::execCommands()
 	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));
 	}
 }
 
@@ -609,21 +649,23 @@ static void error_handler(int err_sig)
 
 	// 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:
@@ -631,6 +673,12 @@ static void error_handler(int err_sig)
 		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);
@@ -642,11 +690,18 @@ static void error_handler(int err_sig)
 
 #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);
 }
 
@@ -672,18 +727,24 @@ bool LyX::init()
 	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");
 	}
 
+	// init LyXDir environment variable
+	string const lyx_dir = package().lyx_dir().absFileName();
+	LYXERR(Debug::INIT, "Setting LyXDir... to \"" << lyx_dir << "\"");
+	if (!setEnv("LyXDir", lyx_dir))
+		LYXERR(Debug::INIT, "\t... failed!");
+
 	//
 	// Read configuration files
 	//
@@ -700,18 +761,29 @@ bool LyX::init()
 	// 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);
+		prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix));
 
 	// Check that user LyX directory is ok.
 	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.
@@ -734,7 +806,7 @@ bool LyX::init()
 	system_lcolor = lcolor;
 
 	// This one is edited through the preferences dialog.
-	if (!readRcFile("preferences"))
+	if (!readRcFile("preferences", true))
 		return false;
 
 	if (!readEncodingsFile("encodings", "unicodesymbols"))
@@ -745,10 +817,9 @@ bool LyX::init()
 	// 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
 	theModuleList.read();
 
@@ -759,6 +830,7 @@ bool LyX::init()
 	// 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);
@@ -770,7 +842,7 @@ bool LyX::init()
 
 	os::windows_style_tex_paths(lyxrc.windows_style_tex_paths);
 	if (!lyxrc.path_prefix.empty())
-		prependEnvPath("PATH", lyxrc.path_prefix);
+		prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix));
 
 	FileName const document_path(lyxrc.document_path);
 	if (document_path.exists() && document_path.isDirectory())
@@ -792,7 +864,7 @@ bool LyX::init()
 	}
 
 	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));
@@ -800,7 +872,7 @@ bool LyX::init()
 	// 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;
 }
 
@@ -831,13 +903,13 @@ static bool needsUpdate(string const & file)
 	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();
 }
@@ -866,7 +938,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
 		    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"))) {
@@ -875,7 +947,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
 	}
 
 	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.
@@ -888,21 +960,22 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
 }
 
 
-bool LyX::readRcFile(string const & name)
+bool LyX::readRcFile(string const & name, bool check_format)
 {
 	LYXERR(Debug::INIT, "About to read " << name << "... ");
 
 	FileName const lyxrc_path = libFileSearch(string(), name);
-	if (!lyxrc_path.empty()) {
-		LYXERR(Debug::INIT, "Found in " << lyxrc_path);
-		if (lyxrc.read(lyxrc_path) < 0) {
-			showFileError(name);
-			return false;
-		}
-	} else {
+	if (lyxrc_path.empty()) {
 		LYXERR(Debug::INIT, "Not found." << lyxrc_path);
+		// FIXME
+		// This was the previous logic, but can it be right??
+		return true;
 	}
-	return true;
+	LYXERR(Debug::INIT, "Found in " << lyxrc_path);
+	bool const success = lyxrc.read(lyxrc_path, check_format);
+	if (!success)
+		showFileError(name);
+	return success;
 }
 
 // Read the languages file `name'
@@ -982,11 +1055,24 @@ int parse_help(string const &, string const &, string &)
 		  "                  Look on Tools->Preferences->File formats->Format\n"
 		  "                  to get an idea which parameters should be passed.\n"
 		  "                  Note that the order of -e and -x switches matters.\n"
+		  "\t-E [--export-to] fmt filename\n"
+		  "                  where fmt is the export format of choice (see --export),\n"
+		  "                  and filename is the destination filename.\n"
 		  "\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-version        summarize version and build info\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-n [--no-remote]\n"
+		  "                  open documents in a new instance\n"
+		  "\t-r [--remote]\n"
+		  "                  open documents in an already running instance\n"
+		  "                  (a working lyxpipe is needed)\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);
 	return 0;
@@ -1041,6 +1127,24 @@ int parse_execute(string const & arg, string const &, string & batch)
 }
 
 
+int parse_export_to(string const & type, string const & output_file, string & batch)
+{
+	if (type.empty()) {
+		lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after "
+					 "--export-to switch")) << endl;
+		exit(1);
+	}
+	if (output_file.empty()) {
+		lyxerr << to_utf8(_("Missing destination filename after "
+					 "--export-to switch")) << endl;
+		exit(1);
+	}
+	batch = "buffer-export " + type + " " + output_file;
+	use_gui = false;
+	return 2;
+}
+
+
 int parse_export(string const & type, string const &, string & batch)
 {
 	if (type.empty()) {
@@ -1080,13 +1184,44 @@ int parse_geometry(string const & arg1, string const &, string &)
 }
 
 
-int parse_batch(string const &, string const &, string &) 
+int parse_batch(string const &, string const &, string &)
 {
 	use_gui = false;
 	return 0;
 }
 
 
+int parse_noremote(string const &, string const &, string &)
+{
+	run_mode = NEW_INSTANCE;
+	return 0;
+}
+
+
+int parse_remote(string const &, string const &, string &)
+{
+	run_mode = USE_REMOTE;
+	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
 
 
@@ -1103,12 +1238,20 @@ void LyX::easyParse(int & argc, char * argv[])
 	cmdmap["-userdir"] = parse_userdir;
 	cmdmap["-x"] = parse_execute;
 	cmdmap["--execute"] = parse_execute;
-	cmdmap["-e"] = parse_export;
+ 	cmdmap["-e"] = parse_export;
 	cmdmap["--export"] = parse_export;
+	cmdmap["-E"] = parse_export_to;
+	cmdmap["--export-to"] = parse_export_to;
 	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;
+	cmdmap["-n"] = parse_noremote;
+	cmdmap["--no-remote"] = parse_noremote;
+	cmdmap["-r"] = parse_remote;
+	cmdmap["--remote"] = parse_remote;
 
 	for (int i = 1; i < argc; ++i) {
 		map<string, cmd_helper>::const_iterator it
@@ -1119,9 +1262,9 @@ void LyX::easyParse(int & argc, char * argv[])
 			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);
@@ -1131,6 +1274,7 @@ void LyX::easyParse(int & argc, char * argv[])
 		// 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];
@@ -1142,29 +1286,36 @@ void LyX::easyParse(int & argc, char * argv[])
 
 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(theApp(), /**/);
+	return theApp()->dispatch(action, dr);
+}
+
+
+vector<string> & theFilesToLoad()
 {
 	LASSERT(singleton_, /**/);
-	return singleton_->pimpl_->buffer_list_;
+	return singleton_->pimpl_->files_to_load_;
 }
 
 
-LyXFunc & theLyXFunc()
+BufferList & theBufferList()
 {
 	LASSERT(singleton_, /**/);
-	return singleton_->pimpl_->lyxfunc_;
+	return singleton_->pimpl_->buffer_list_;
 }
 
 
@@ -1235,27 +1386,20 @@ Movers & theSystemMovers()
 }
 
 
-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"];
 }
 
 
-graphics::Previews & thePreviews()
-{
-	LASSERT(singleton_, /**/);
-	return singleton_->pimpl_->preview_;
-}
-
-
 Session & theSession()
 {
 	LASSERT(singleton_, /**/);
@@ -1280,23 +1424,48 @@ SpellChecker * theSpellChecker()
 
 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 (!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 (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