Increase tex2lyx output format to 296.

296: new syntax of include inset

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

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index 1f748de58df9f5bde96849854c54a3b4caea5b7b..174e5c79b57ecd905587d30194d7df550eb8c71c 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 = 295;
+int const LYX_FORMAT = 296;
 
 /// path of the master .tex file
 extern std::string getMasterFilePath();

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index b5e02d5a79e1e057e5169818bec7764fa8c62b2b..09b87be2254bb133df9a3cc7c22a7ba39b67200c 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2492,7 +2492,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 
                else if (t.cs() == "input" || t.cs() == "include"
                         || t.cs() == "verbatiminput") {
-                       string name = '\\' + t.cs();
+                       string name = t.cs();
                        if (t.cs() == "verbatiminput"
                            && p.next_token().asInput() == "*")
                                name += p.get_token().asInput();
@@ -2554,9 +2554,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                os << "\ttemplate XFig\n"
                                   << "\tfilename " << outname << '\n';
                        } else {
-                               begin_inset(os, "Include ");
-                               os << name << '{' << outname
-                                  << "}\npreview false\n";
+                               begin_command_inset(os, "include", name);
+                               os << "preview false\n"
+                                     "filename \"" << outname << "\"\n";
                        }
                        end_inset(os);
                }