X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftexstream.cpp;h=f8f298bdafeff2e98e31c2ca565d041cef37ce80;hb=718a353b49d903f3e50c895a29f20f8970db2d06;hp=eb1834b5de74e84486f429025347fde7592f6828;hpb=f3e099960a97c4f8ae50230449a9c413e6851618;p=lyx.git

diff --git a/src/texstream.cpp b/src/texstream.cpp
index eb1834b5de..f8f298bdaf 100644
--- a/src/texstream.cpp
+++ b/src/texstream.cpp
@@ -59,11 +59,23 @@ void otexrowstream::put(char_type const & c)
 
 void otexstream::put(char_type const & c)
 {
+	bool isprotected = false;
 	if (protectspace_) {
-		if (!canbreakline_ && c == ' ')
+		if (!canbreakline_ && c == ' ') {
 			os() << "{}";
+			isprotected = true;
+		}
 		protectspace_ = false;
 	}
+	if (terminate_command_) {
+		if ((c == ' ' || c == '\0' || c == '\n') && !isprotected)
+			// A space or line break follows. Terminate with brackets.
+			os() << "{}";
+		else if (c != '\\' && c != '{' && c != '}')
+			// Non-terminating character follows. Terminate with space.
+			os() << " ";
+		terminate_command_ = false;
+	}
 	otexrowstream::put(c);
 	lastChar(c);
 }
@@ -78,8 +90,9 @@ size_t otexstringstream::length()
 
 TexString otexstringstream::release()
 {
-	TexString ts{ods_.str(), TexRow()};
-	swap(ts.texrow, texrow());
+	TexString ts(ods_.str(), move(texrow()));
+	// reset this
+	texrow() = TexRow();
 	ods_.clear();
 	ods_.str(docstring());
 	return ts;
@@ -88,15 +101,19 @@ TexString otexstringstream::release()
 
 BreakLine breakln;
 SafeBreakLine safebreakln;
+TerminateCommand termcmd;
 
 
 otexstream & operator<<(otexstream & ots, BreakLine)
 {
 	if (ots.canBreakLine()) {
+		if (ots.terminateCommand())
+			ots << "{}";
 		ots.otexrowstream::put('\n');
 		ots.lastChar('\n');
 	}
 	ots.protectSpace(false);
+	ots.terminateCommand(false);
 	return ots;
 }
 
@@ -105,10 +122,20 @@ otexstream & operator<<(otexstream & ots, SafeBreakLine)
 {
 	otexrowstream & otrs = ots;
 	if (ots.canBreakLine()) {
+	    if (ots.terminateCommand())
+			otrs << "{}";
 		otrs << "%\n";
 		ots.lastChar('\n');
 	}
 	ots.protectSpace(false);
+	ots.terminateCommand(false);
+	return ots;
+}
+
+
+otexstream & operator<<(otexstream & ots, TerminateCommand)
+{
+	ots.terminateCommand(true);
 	return ots;
 }
 
@@ -151,11 +178,24 @@ otexstream & operator<<(otexstream & ots, TexString ts)
 		return ots;
 
 	otexrowstream & otrs = ots;
+	bool isprotected = false;
+	char_type const c = ts.str[0];
 	if (ots.protectSpace()) {
-		if (!ots.canBreakLine() && ts.str[0] == ' ')
+		if (!ots.canBreakLine() && c == ' ') {
 			otrs << "{}";
+			isprotected = true;
+		}
 		ots.protectSpace(false);
 	}
+	if (ots.terminateCommand()) {
+		if ((c == ' ' || c == '\0' || c == '\n') && !isprotected)
+			// A space or line break follows. Terminate with brackets.
+			otrs << "{}";
+		else if (c != '\\' && c != '{' && c != '}')
+			// Non-terminating character follows. Terminate with space.
+			otrs << " ";
+		ots.terminateCommand(false);
+	}
 
 	if (len > 1)
 		ots.canBreakLine(ts.str[len - 2] != '\n');
@@ -182,11 +222,24 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
 	if (len == 0)
 		return ots;
 	otexrowstream & otrs = ots;
+	bool isprotected = false;
+	char_type const c = s[0];
 	if (ots.protectSpace()) {
-		if (!ots.canBreakLine() && s[0] == ' ')
+		if (!ots.canBreakLine() && c == ' ') {
 			otrs << "{}";
+			isprotected = true;
+		}
 		ots.protectSpace(false);
 	}
+	if (ots.terminateCommand()) {
+		if ((c == ' ' || c == '\0' || c == '\n') && !isprotected)
+			// A space or line break follows. Terminate with brackets.
+			otrs << "{}";
+		else if (c != '\\' && c != '{' && c != '}')
+			// Non-terminating character follows. Terminate with space.
+			otrs << " ";
+		ots.terminateCommand(false);
+	}
 
 	if (contains(s, 0xF0000)) {
 		// Some encoding changes for the underlying stream are embedded
@@ -289,6 +342,7 @@ otexstream & operator<<(otexstream & ots, Type value)
 	ots.os() << value;
 	ots.lastChar(0);
 	ots.protectSpace(false);
+	ots.terminateCommand(false);
 	return ots;
 }
 
@@ -301,4 +355,4 @@ template otexstream & operator<< <unsigned long>(otexstream &, unsigned long);
 template otexstream & operator<< <unsigned long long>(otexstream &, unsigned long long);
 #endif
 
-}
+} // namespace lyx