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 381aa56aeca9b5a9cba806832fc4d20fb1fe322f..9b323b30c049211da5313b50a14faadc7c41a20a 100644 (file)
--- 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 392b24a9f2a16cbdb315b1f086265ac766631f53..d7c50ba413a8ad396990ae5ebd44253d4817c63a 100644 (file)
--- 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) {