The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 80884330d1221a08699b00e64181eb18cc6ce783
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sat Jun 30 03:25:19 2012 +0200
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 5d0335a..fc3b4d2 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
-----------------------------------------------------------------------
Summary of changes:
src/tex2lyx/Parser.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
The LyX Source Repository
