From: Uwe Stöhr <uwestoehr@web.de>
Date: Mon, 20 Dec 2010 01:12:35 +0000 (+0000)
Subject: tex2lyx/text.cpp: fix other missing issues from r36947
X-Git-Tag: 2.0.0~1310
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2385086972409e90fefbad5e9c56700b0489780f;p=features.git

tex2lyx/text.cpp: fix other missing issues from r36947

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

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 4e525fd0d6..45a1058aad 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -903,7 +903,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
 			// the two environments as one otherwise (bug 5716)
 			docstring const sep = from_ascii("--Separator--");
 			TeX2LyXDocClass const & textclass(parent_context.textclass);
-			if (LYX_FORMAT >= 273 && textclass.hasLayout(sep)) {
+			if (textclass.hasLayout(sep)) {
 				Context newcontext(parent_context);
 				newcontext.layout = &(textclass[sep]);
 				newcontext.check_layout(os);
@@ -2432,13 +2432,13 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			skip_spaces_braces(p);
 		}
 
-		else if (LYX_FORMAT >= 307 && t.cs() == "slash") {
+		else if (t.cs() == "slash") {
 			context.check_layout(os);
 			os << "\\SpecialChar \\slash{}\n";
 			skip_spaces_braces(p);
 		}
 
-		else if (LYX_FORMAT >= 307 && t.cs() == "nobreakdash") {
+		else if (t.cs() == "nobreakdash") {
 			context.check_layout(os);
 			os << "\\SpecialChar \\nobreakdash\n";
 		}