From: Georg Baum <baum@lyx.org>
Date: Fri, 27 Nov 2015 19:35:13 +0000 (+0100)
Subject: Simplify logic
X-Git-Tag: testtag~177
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5c35ebcd2488119b1041c5cea9cdd8bdc1a6d710;p=lyx.git

Simplify logic

The old code was more complicated than needed, we have unstarred_name to make
our live easier. The test proves that the new code works as before.
---

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index ecf6bf2110..73a8d69765 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1555,25 +1555,17 @@ void parse_environment(Parser & p, ostream & os, bool outer,
 		preamble.registerAutomaticallyLoadedPackage("verbatim");
 	}
 
-	else if (unstarred_name == "verbatim" || name == "verbatim*") {
+	else if (unstarred_name == "verbatim") {
 		// FIXME: this should go in the generic code that
 		// handles environments defined in layout file that
 		// have "PassThru 1". However, the code over there is
 		// already too complicated for my taste.
-		string ascii_name;
-		string env_name;
-		if (unstarred_name == "verbatim") {
-			ascii_name = "Verbatim";
-			env_name = "verbatim";
-		}
-		if (name == "verbatim*") {
-			ascii_name = "Verbatim*";
-			env_name = name;
-		}
+		string const ascii_name =
+			(name == "verbatim*") ? "Verbatim*" : "Verbatim";
 		parent_context.new_paragraph(os);
 		Context context(true, parent_context.textclass,
 				&parent_context.textclass[from_ascii(ascii_name)]);
-		string s = p.verbatimEnvironment(env_name);
+		string s = p.verbatimEnvironment(name);
 		output_ert(os, s, context);
 		p.skip_spaces();
 	}