From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Mon, 27 Dec 2010 18:14:55 +0000 (+0000)
Subject: Increase tex2lyx output format to 342.
X-Git-Tag: 2.0.0~1253
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4a54c581a211b94e0f843ca50fe10af92a39e95b;p=lyx.git

Increase tex2lyx output format to 342.
335:     Create space inset in new syntax
336:     Nothing to do (empty lyx2lyx conversion)
337:     Nothing to do (tex2lyx does use the display flag)
338-339: Nothing to do (empty lyx2lyx conversion)
340:     Nothing to do (tex2lyx does not output empty layout names)
341-342: Nothing to do (empty lyx2lyx conversion)


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

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index 381aa56aec..9b323b30c0 100644
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -114,7 +114,7 @@ extern CommandMap known_math_environments;
 ///
 extern bool noweb_mode;
 /// LyX format that is created by tex2lyx
-int const LYX_FORMAT = 334;
+int const LYX_FORMAT = 342;
 
 /// path of the master .tex file
 extern std::string getMasterFilePath();
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 392b24a9f2..d7c50ba413 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -712,7 +712,7 @@ void parse_box(Parser & p, ostream & os, unsigned flags, bool outer,
 			p.skip_spaces();
 			// We add a protected space if something real follows
 			if (p.good() && p.next_token().cat() != catComment) {
-				begin_inset(os, "Space ~\n");
+				begin_inset(os, "space ~\n");
 				end_inset(os);
 			}
 		}
@@ -1464,7 +1464,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 				if (context.layout->free_spacing)
 					os << ' ';
 				else {
-					begin_inset(os, "Space ~\n");
+					begin_inset(os, "space ~\n");
 					end_inset(os);
 				}
 			} else
@@ -2732,7 +2732,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		else if (is_known(t.cs(), known_spaces)) {
 			char const * const * where = is_known(t.cs(), known_spaces);
 			context.check_layout(os);
-			begin_inset(os, "Space ");
+			begin_inset(os, "space ");
 			os << '\\' << known_coded_spaces[where - known_spaces]
 			   << '\n';
 			end_inset(os);
@@ -2857,7 +2857,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			if (t.cs()[0] == 'h' && (known_unit || known_hspace)) {
 				// Literal horizontal length or known variable
 				context.check_layout(os);
-				begin_inset(os, "Space ");
+				begin_inset(os, "space ");
 				os << name;
 				if (starred)
 					os << '*';
@@ -2880,7 +2880,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 					os << '*';
 				end_inset(os);
 			} else {
-				// LyX can't handle other length variables in Inset V?Space
+				// LyX can't handle other length variables in Inset VSpace/space
 				if (starred)
 					name += '*';
 				if (valid) {