X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FParser.cpp;h=20f5058901e163d9ab7f54eece6a73b0b31e1cd3;hb=aa9fed932225bb9344a056df3610258f19fa94dd;hp=75eb5182033af6a2021df6972ddc18c4b035bf75;hpb=df95041141c01c04fe8d4af43acc1cc1bc1b4795;p=lyx.git

diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index 75eb518203..20f5058901 100644
--- 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();
@@ -505,6 +502,28 @@ string const Parser::plainEnvironment(string const & name)
 }
 
 
+string const Parser::plainCommand(char left, char right, string const & name)
+{
+	if (!good())
+		return string();
+	// check if first token is really the start character
+	Token tok = get_token();
+	if (tok.character() != left) {
+		cerr << "first character does not match start character of command \\" << name << endl;
+		return string();
+	}
+	ostringstream os;
+	for (Token t = get_token(); good(); t = get_token()) {
+		if (t.character() == right) {
+			return os.str();
+		} else
+			os << t.asInput();
+	}
+	cerr << "unexpected end of input" << endl;
+	return os.str();
+}
+
+
 void Parser::tokenize_one()
 {
 	catInit();