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 5d0335ac82143e61fff34a4aaf99c1e172ab56fa..fc3b4d2407e3982f19a5d3217706309112477c4f 100644 (file)
--- 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