Improvements to Parser::verbatimStuff

[features.git] / src / tex2lyx / text.cpp

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index a4785d4aed167ae033fcadcab27609a7888f74bc..fae7eb16af00769e5d6385b8d5178c6c461d29ea 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1189,7 +1189,8 @@ void parse_listings(Parser & p, ostream & os, Context & parent_context, bool in_
                // set catcodes to verbatim early, just in case.
                p.setCatcodes(VERBATIM_CATCODES);
                string delim = p.get_token().asInput();
-               s = p.verbatimStuff(delim);
+               //FIXME: handler error condition
+               s = p.verbatimStuff(delim).second;
 //             context.new_paragraph(os);
        } else
                s = p.verbatimEnvironment("lstlisting");
@@ -3920,7 +3921,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        // set catcodes to verbatim early, just in case.
                        p.setCatcodes(VERBATIM_CATCODES);
                        string delim = p.get_token().asInput();
-                       string const arg = p.verbatimStuff(delim);
+                       //FIXME: handle error condition
+                       string const arg = p.verbatimStuff(delim).second;
                        output_ert_inset(os, "\\verb" + delim + arg + delim, context);
                }
 
@@ -4506,7 +4508,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                string delim = p.get_token().asInput();
                                if (delim != "{")
                                        cerr << "Warning: bad delimiter for command " << t.asInput() << endl;
-                               string const arg = p.verbatimStuff("}");
+                               //FIXME: handle error condition
+                               string const arg = p.verbatimStuff("}").second;
                                Context newcontext(true, context.textclass);
                                if (newinsetlayout->forcePlainLayout())
                                        newcontext.layout = &context.textclass.plainLayout();