r40859 - in lyx-devel/trunk/src/tex2lyx: . test

[uwestoehr]

Author: uwestoehr
Date: Mon Mar  5 22:04:21 2012
New Revision: 40859
URL: http://www.lyx.org/trac/changeset/40859

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

Modified:
   lyx-devel/trunk/src/tex2lyx/Parser.cpp
   lyx-devel/trunk/src/tex2lyx/test/test-structure.tex

Modified: lyx-devel/trunk/src/tex2lyx/Parser.cpp
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/Parser.cpp      Mon Mar  5 18:14:09 2012        
(r40858)
+++ lyx-devel/trunk/src/tex2lyx/Parser.cpp      Mon Mar  5 22:04:21 2012        
(r40859)
@@ -488,10 +488,7 @@
 
        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();

Modified: lyx-devel/trunk/src/tex2lyx/test/test-structure.tex
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/test/test-structure.tex Mon Mar  5 18:14:09 
2012        (r40858)
+++ lyx-devel/trunk/src/tex2lyx/test/test-structure.tex Mon Mar  5 22:04:21 
2012        (r40859)
@@ -296,7 +296,7 @@
 \begin{centering}
 
 
-zzz
+zzz \section{
 \end{raggedleft}
 
 \end{verbatim}