X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FForkedCalls.cpp;h=4827947d370a2f22abf5848914724dcade3ba37c;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=7a3c141542dbef181408736370d5cbf994f73391;hpb=e5cc5ac2e82f6dd1939b35b138489d1a1e3d3bae;p=lyx.git

diff --git a/src/support/ForkedCalls.cpp b/src/support/ForkedCalls.cpp
index 7a3c141542..4827947d37 100644
--- a/src/support/ForkedCalls.cpp
+++ b/src/support/ForkedCalls.cpp
@@ -47,7 +47,6 @@
 using namespace std;
 
 
-
 namespace lyx {
 namespace support {
 
@@ -59,7 +58,7 @@ namespace {
 //
 /////////////////////////////////////////////////////////////////////
 
-class Murder : public boost::signals::trackable {
+class Murder : public boost::signals2::trackable {
 public:
 	//
 	static void killItDead(int secs, pid_t pid)
@@ -113,7 +112,7 @@ bool ForkedProcess::IAmAChild = false;
 
 void ForkedProcess::emitSignal()
 {
-	if (signal_.get()) {
+	if (signal_) {
 		signal_->operator()(pid_, retval_);
 	}
 }
@@ -270,8 +269,8 @@ int ForkedProcess::waitForChild()
 //
 /////////////////////////////////////////////////////////////////////
 
-ForkedCall::ForkedCall(string const & path)
-	: cmd_prefix_(to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path))))
+ForkedCall::ForkedCall(string const & path, string const & lpath)
+	: cmd_prefix_(to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path, lpath))))
 {}
 
 
@@ -282,7 +281,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
 		return retval_;
 	}
 
-	command_ = what;
+	command_ = commandPrep(trim(what));
 	signal_.reset();
 	return run(Wait);
 }
@@ -290,7 +289,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
 
 int ForkedCall::startScript(string const & what, SignalTypePtr signal)
 {
-	command_ = what;
+	command_ = commandPrep(trim(what));
 	signal_  = signal;
 
 	return run(DontWait);
@@ -300,10 +299,14 @@ int ForkedCall::startScript(string const & what, SignalTypePtr signal)
 // generate child in background
 int ForkedCall::generateChild()
 {
-	string const line = trim(cmd_prefix_ + command_);
-	if (line.empty())
+	if (command_.empty())
 		return 1;
 
+	// Make sure that a V2 python is run, if available.
+	string const line = cmd_prefix_ +
+		(prefixIs(command_, "python -tt")
+		 ? os::python() + command_.substr(10) : command_);
+
 #if !defined (_WIN32)
 	// POSIX
 
@@ -323,25 +326,44 @@ int ForkedCall::generateChild()
 	// 2. If we are inside quotes, then don't replace the white space
 	//    but do remove the quotes themselves. We do this naively by
 	//    replacing the quote with '\0' which is fine if quotes
-	//    delimit the entire word.
+	//    delimit the entire word. However, if quotes do not delimit the
+	//    entire word (i.e., open quote is inside word), simply discard
+	//    them such as not to break the current word.
 	char inside_quote = 0;
+	char c_before_open_quote = ' ';
 	vector<char>::iterator it = vec.begin();
+	vector<char>::iterator itc = vec.begin();
 	vector<char>::iterator const end = vec.end();
-	for (; it != end; ++it) {
+	for (; it != end; ++it, ++itc) {
 		char const c = *it;
 		if (!inside_quote) {
-			if (c == ' ')
-				*it = '\0';
-			else if (c == '\'' || c == '"') {
-				*it = '\0';
+			if (c == '\'' || c == '"') {
+				if (c_before_open_quote == ' ')
+					*itc = '\0';
+				else
+					--itc;
 				inside_quote = c;
+			} else {
+				if (c == ' ')
+					*itc = '\0';
+				else
+					*itc = c;
+				c_before_open_quote = c;
 			}
 		} else if (c == inside_quote) {
-			*it = '\0';
+			if (c_before_open_quote == ' ')
+				*itc = '\0';
+			else
+				--itc;
 			inside_quote = 0;
-		}
+		} else
+			*itc = c;
 	}
 
+	// Clear what remains.
+	for (; itc != end; ++itc)
+		*itc = '\0';
+
 	// Build an array of pointers to each word.
 	it = vec.begin();
 	vector<char *> argv;
@@ -358,7 +380,7 @@ int ForkedCall::generateChild()
 		vector<char *>::iterator ait = argv.begin();
 		vector<char *>::iterator const aend = argv.end();
 		lyxerr << "<command>\n\t" << line
-		       << "\n\tInterpretted as:\n\n";
+		       << "\n\tInterpreted as:\n\n";
 		for (; ait != aend; ++ait)
 			if (*ait)
 				lyxerr << '\t'<< *ait << '\n';
@@ -452,7 +474,7 @@ void callNext()
 	Process pro = callQueue_.front();
 	callQueue_.pop();
 	// Bind our chain caller
-	pro.second->connect(lyx::bind(&ForkedCallQueue::callback, _1, _2));
+	pro.second->connect(callback);
 	ForkedCall call;
 	//If we fail to fork the process, then emit the signal
 	//to tell the outside world that it failed.