X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=a732c7ee809e5fcd9a0b52429394e3133d6f96c9;hb=670efa8f646218f2a378f0cc614c4c37a9f6b89a;hp=c3d84b22f614d2c636cd18a1990313d679e15386;hpb=e4fada8c5712b2bccda662d716a6de11bbfdc891;p=lyx.git

diff --git a/src/LyX.cpp b/src/LyX.cpp
index c3d84b22f6..a732c7ee80 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -61,13 +61,12 @@
 #include "support/Messages.h"
 #include "support/os.h"
 #include "support/Package.h"
-
-#include "support/bind.h"
-#include <boost/scoped_ptr.hpp>
+#include "support/unique_ptr.h"
 
 #include <algorithm>
-#include <iostream>
 #include <csignal>
+#include <iostream>
+#include <functional>
 #include <map>
 #include <stdlib.h>
 #include <string>
@@ -150,13 +149,13 @@ struct LyX::Impl {
 	///
 	CmdDef toplevel_cmddef_;
 	///
-	boost::scoped_ptr<Server> lyx_server_;
+	unique_ptr<Server> lyx_server_;
 	///
-	boost::scoped_ptr<ServerSocket> lyx_socket_;
+	unique_ptr<ServerSocket> lyx_socket_;
 	///
-	boost::scoped_ptr<frontend::Application> application_;
+	unique_ptr<frontend::Application> application_;
 	/// lyx session, containing lastfiles, lastfilepos, and lastopened
-	boost::scoped_ptr<Session> session_;
+	unique_ptr<Session> session_;
 
 	/// Files to load at start.
 	vector<string> files_to_load_;
@@ -404,10 +403,8 @@ void LyX::prepareExit()
 			LYXERR(Debug::INFO, "Deleting tmp dir "
 				<< 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()));
-				Alert::warning(_("Unable to remove temporary directory"), msg);
+				LYXERR0(bformat(_("Unable to remove the temporary directory %1$s"),
+					from_utf8(package().temp_dir().absFileName())));
 			}
 		}
 	}
@@ -474,21 +471,51 @@ int LyX::execWithoutGui(int & argc, char * argv[])
 		return exit_status;
 	}
 
-	// this is correct, since return values are inverted.
-	exit_status = !loadFiles();
+	// Used to keep track of which buffers were explicitly loaded by user request.
+	// This is necessary because master and child document buffers are loaded, even 
+	// if they were not named on the command line. We do not want to dispatch to
+	// those.
+	vector<Buffer *> command_line_buffers;
+
+	// Load the files specified on the command line
+	vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
+	vector<string>::const_iterator end = pimpl_->files_to_load_.end();
+	for (; it != end; ++it) {
+		// get absolute path of file and add ".lyx" to the filename if necessary
+		FileName fname = fileSearch(string(), os::internal_path(*it), "lyx",
+																may_not_exist);
+
+		if (fname.empty())
+			continue;
+
+		Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName());
+		LYXERR(Debug::FILES, "Loading " << fname);
+		if (buf && buf->loadLyXFile() == Buffer::ReadSuccess) {
+			ErrorList const & el = buf->errorList("Parse");
+			for(ErrorItem const & e : el)
+				printError(e);
+			command_line_buffers.push_back(buf);
+		} else {
+			if (buf)
+				pimpl_->buffer_list_.release(buf);
+			docstring const error_message =
+					bformat(_("LyX failed to load the following file: %1$s"),
+									from_utf8(fname.absFileName()));
+			lyxerr << to_utf8(error_message) << endl;
+			exit_status = 1; // failed
+		}
+	}
 
-	if (pimpl_->batch_commands.empty() || pimpl_->buffer_list_.empty()) {
+	if (exit_status || pimpl_->batch_commands.empty() || pimpl_->buffer_list_.empty()) {
 		prepareExit();
 		return exit_status;
 	}
 
-	BufferList::iterator begin = pimpl_->buffer_list_.begin();
-
+	// Iterate through the buffers that were specified on the command line
 	bool final_success = false;
-	for (BufferList::iterator I = begin; I != pimpl_->buffer_list_.end(); ++I) {
-		Buffer * buf = *I;
-		if (buf != buf->masterBuffer())
-			continue;
+	vector<Buffer *>::iterator buf_it = command_line_buffers.begin();
+	for (; buf_it != command_line_buffers.end(); ++buf_it) {
+		Buffer * buf = *buf_it;
 		vector<string>::const_iterator bcit  = pimpl_->batch_commands.begin();
 		vector<string>::const_iterator bcend = pimpl_->batch_commands.end();
 		DispatchResult dr;
@@ -503,42 +530,6 @@ int LyX::execWithoutGui(int & argc, char * argv[])
 }
 
 
-bool LyX::loadFiles()
-{
-	LATTEST(!use_gui);
-	bool success = true;
-	vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
-	vector<string>::const_iterator end = pimpl_->files_to_load_.end();
-
-	for (; it != end; ++it) {
-		// get absolute path of file and add ".lyx" to
-		// the filename if necessary
-		FileName fname = fileSearch(string(), os::internal_path(*it), "lyx",
-			may_not_exist);
-
-		if (fname.empty())
-			continue;
-
-		Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName());
-		if (buf->loadLyXFile() == Buffer::ReadSuccess) {
-			ErrorList const & el = buf->errorList("Parse");
-			if (!el.empty())
-				for_each(el.begin(), el.end(),
-				bind(&LyX::printError, this, _1));
-		}
-		else {
-			pimpl_->buffer_list_.release(buf);
-			docstring const error_message =
-				bformat(_("LyX failed to load the following file: %1$s"),
-				from_utf8(fname.absFileName()));
-			lyxerr << to_utf8(error_message) << endl;
-			success = false;
-		}
-	}
-	return success;
-}
-
-
 void execBatchCommands()
 {
 	LAPPERR(singleton_);
@@ -783,33 +774,35 @@ void cleanDuplicateEnvVars()
 static void initTemplatePath()
 {
 	FileName const package_template_path =
-		FileName(addPath(package().system_support().absFileName(), "templates"));
+		FileName(addName(package().system_support().absFileName(), "templates"));
 
 	if (lyxrc.template_path.empty()) {
 		lyxrc.template_path = package_template_path.absFileName();
 	}
 #if defined (USE_MACOSX_PACKAGING)
 	FileName const user_template_path =
-		FileName(addPath(package().user_support().absFileName(), "templates"));
+		FileName(addName(package().user_support().absFileName(), "templates"));
 
 	if (package_template_path != FileName(lyxrc.template_path) &&
 		user_template_path != FileName(lyxrc.template_path))
 	{
 		return;
 	}
-	/// addPath cannot be used here.
-	/// The path with trailing slash doesn't work as symlink name.
 	FileName const user_template_link =
-		FileName(user_template_path.absFileName() + "SystemTemplates");
-	if (user_template_link.isSymLink()) {
+		FileName(addName(user_template_path.absFileName(),"SystemTemplates"));
+	if (user_template_link.isSymLink() && !equivalent(user_template_link, package_template_path)) {
 		user_template_link.removeFile();
 	}
 	if (!user_template_link.exists()) {
 		if (!package_template_path.link(user_template_link)) {
-			LYXERR(Debug::INIT, "Cannot create symlink " + user_template_link.absFileName());
-			lyxrc.template_path = package_template_path.absFileName();
+			FileName const user_support = package().user_support();
+			if (user_support.exists() && user_support.isDirectory()) {
+				LYXERR(Debug::INIT, "Cannot create symlink " + user_template_link.absFileName());
+				lyxrc.template_path = package_template_path.absFileName();
+			}
 			return;
 		}
+		LYXERR(Debug::INIT, "Symlink \"" << user_template_link.absFileName() << "\" created.");
 	}
 	lyxrc.template_path = user_template_path.absFileName();
 #endif
@@ -883,6 +876,8 @@ bool LyX::init()
 
 		if (queryUserLyXDir(package().explicit_user_support())) {
 			package().reconfigureUserLyXDir("");
+			// Now the user directory is present on first start.
+			initTemplatePath();
 		}
 		fileUnlock(fd, lock_file.c_str());
 	}
@@ -1113,7 +1108,7 @@ bool LyX::readEncodingsFile(string const & enc_name,
 namespace {
 
 /// return the the number of arguments consumed
-typedef boost::function<int(string const &, string const &, string &)> cmd_helper;
+typedef function<int(string const &, string const &, string &)> cmd_helper;
 
 int parse_dbg(string const & arg, string const &, string &)
 {
@@ -1386,7 +1381,7 @@ FuncStatus getStatus(FuncRequest const & action)
 }
 
 
-void dispatch(FuncRequest const & action)
+DispatchResult const & dispatch(FuncRequest const & action)
 {
 	LAPPERR(theApp());
 	return theApp()->dispatch(action);
@@ -1396,7 +1391,7 @@ void dispatch(FuncRequest const & action)
 void dispatch(FuncRequest const & action, DispatchResult & dr)
 {
 	LAPPERR(theApp());
-	return theApp()->dispatch(action, dr);
+	theApp()->dispatch(action, dr);
 }
 
 
@@ -1419,7 +1414,7 @@ Server & theServer()
 	// FIXME: this should not be use_gui dependent
 	LWARNIF(use_gui);
 	LAPPERR(singleton_);
-	return *singleton_->pimpl_->lyx_server_.get();
+	return *singleton_->pimpl_->lyx_server_;
 }
 
 
@@ -1428,7 +1423,7 @@ ServerSocket & theServerSocket()
 	// FIXME: this should not be use_gui dependent
 	LWARNIF(use_gui);
 	LAPPERR(singleton_);
-	return *singleton_->pimpl_->lyx_socket_.get();
+	return *singleton_->pimpl_->lyx_socket_;
 }