tex2lyx/text.cpp: don't parse catBegin in verbatim environments

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40859 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index 75eb5182033af6a2021df6972ddc18c4b035bf75..06027e880ad2d0209116f7ebf840535a739e3258 100644 (file)
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -488,10 +488,7 @@ string const Parser::plainEnvironment(string const & name)
 
        ostringstream os;
        for (Token t = get_token(); good(); t = get_token()) {
-               if (t.cat() == catBegin) {
-                       putback();
-                       os << '{' << verbatim_item() << '}';
-               } else if (t.asInput() == "\\end") {
+               if (t.asInput() == "\\end") {
                        string const end = getArg('{', '}');
                        if (end == name)
                                return os.str();

diff --git a/src/tex2lyx/test/test-structure.tex b/src/tex2lyx/test/test-structure.tex
index b487bf17b4ba8f14ebc8acfc962a3772dad90726..71f4c423ec90b5e8f2ea7355aa814b8590ebb32b 100644 (file)
--- a/src/tex2lyx/test/test-structure.tex
+++ b/src/tex2lyx/test/test-structure.tex
@@ -296,7 +296,7 @@ jkh \ blah
 \begin{centering}
 
 
-zzz
+zzz \section{
 \end{raggedleft}
 
 \end{verbatim}