X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FForkedCalls.cpp;h=d77248eadcb12bb35e45e959afbc755e38808d74;hb=faa87bf9f30b943397429a04254d96963bbf38bc;hp=fd4fb62d1270f1780e735db1394a5ab2246b40e9;hpb=e6254e6fb2113e59832fbd31c941e0e520ebf0f2;p=lyx.git

diff --git a/src/support/ForkedCalls.cpp b/src/support/ForkedCalls.cpp
index fd4fb62d12..d77248eadc 100644
--- a/src/support/ForkedCalls.cpp
+++ b/src/support/ForkedCalls.cpp
@@ -84,7 +84,7 @@ private:
 	Murder(int secs, pid_t pid)
 		: timeout_(1000*secs, Timeout::ONETIME), pid_(pid)
 	{
-		timeout_.timeout.connect(bind(&Murder::kill, this));
+		timeout_.timeout.connect(lyx::bind(&Murder::kill, this));
 		timeout_.start();
 	}
 
@@ -113,7 +113,7 @@ bool ForkedProcess::IAmAChild = false;
 
 void ForkedProcess::emitSignal()
 {
-	if (signal_.get()) {
+	if (signal_) {
 		signal_->operator()(pid_, retval_);
 	}
 }
@@ -270,6 +270,10 @@ int ForkedProcess::waitForChild()
 //
 /////////////////////////////////////////////////////////////////////
 
+ForkedCall::ForkedCall(string const & path)
+	: cmd_prefix_(to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path))))
+{}
+
 
 int ForkedCall::startScript(Starttype wait, string const & what)
 {
@@ -278,7 +282,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
 		return retval_;
 	}
 
-	command_ = what;
+	command_ = trim(what);
 	signal_.reset();
 	return run(Wait);
 }
@@ -286,7 +290,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
 
 int ForkedCall::startScript(string const & what, SignalTypePtr signal)
 {
-	command_ = what;
+	command_ = trim(what);
 	signal_  = signal;
 
 	return run(DontWait);
@@ -296,10 +300,14 @@ int ForkedCall::startScript(string const & what, SignalTypePtr signal)
 // generate child in background
 int ForkedCall::generateChild()
 {
-	string line = trim(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
 
@@ -319,25 +327,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;
@@ -448,7 +475,7 @@ void callNext()
 	Process pro = callQueue_.front();
 	callQueue_.pop();
 	// Bind our chain caller
-	pro.second->connect(bind(&ForkedCallQueue::callback, _1, _2));
+	pro.second->connect(lyx::bind(&ForkedCallQueue::callback, _1, _2));
 	ForkedCall call;
 	//If we fail to fork the process, then emit the signal
 	//to tell the outside world that it failed.
@@ -537,8 +564,8 @@ static ListType forkedCalls;
 iterator find_pid(pid_t pid)
 {
 	return find_if(forkedCalls.begin(), forkedCalls.end(),
-		       bind(equal_to<pid_t>(),
-			    bind(&ForkedCall::pid, _1),
+			    lyx::bind(equal_to<pid_t>(),
+			    lyx::bind(&ForkedCall::pid, _1),
 			    pid));
 }