From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sat, 30 Jun 2012 01:25:19 +0000 (+0200)
Subject: tex2lyx: fix handling of \verb
X-Git-Tag: 2.1.0beta1~1702
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=80884330d1221a08699b00e64181eb18cc6ce783;p=features.git

tex2lyx: fix handling of \verb

- Parser.cpp: \verb can have any character as delimiter (except of ASCII letters) not only '+', therefore partly revert [3943b887/lyxgit] and fix it for all cases
---

diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index 5d0335ac82..fc3b4d2407 100644
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -399,12 +399,12 @@ Parser::Arg Parser::getFullArg(char left, char right)
 		putback();
 		return make_pair(false, string());
 	} 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)
+		// for \verb a single '\' is allowed no matter what the delimiter is
+		// for example "\verb+\+" (reported as bug #4468)
+		// To support this, we allow single '\' if it is the only character
+		// within the delimiters
+		if (next_token().cat() == catEscape)
+			if (next_token().character() == c)
 				result += '\\';
 		while ((c = getChar()) != right && good()) {
 			// Ignore comments