From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sat, 23 Jun 2012 18:00:49 +0000 (+0200)
Subject: tex2lyx/Parser.cpp: fix bug #4468: single '\' are allowed in the special case of... 
X-Git-Tag: 2.1.0beta1~1740^2~1
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3943b887;p=features.git

tex2lyx/Parser.cpp: fix bug #4468: single '\' are allowed in the special case of '+' as comment argument delimiter
---

diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index 20f5058901..5d0335ac82 100644
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -398,7 +398,14 @@ Parser::Arg Parser::getFullArg(char left, char right)
 	if (c != left) {
 		putback();
 		return make_pair(false, string());
-	} else
+	} else {
+		// in case of the '+' as delimiter single a '\' is allowed
+		// as content, for example "\verb+\+" (reported as bug #4468)
+		// we need special handling because single \ are normally ignored
+		// or taken as start of a command
+		if (c == '+')
+			if (next_token().cat() == catEscape)
+				result += '\\';
 		while ((c = getChar()) != right && good()) {
 			// Ignore comments
 			if (curr_token().cat() == catComment) {
@@ -408,7 +415,7 @@ Parser::Arg Parser::getFullArg(char left, char right)
 			else
 				result += curr_token().asInput();
 		}
-
+	}
 	return make_pair(true, result);
 }