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

Increase tex2lyx output format to 343.
343: Write the use_default_options header flag


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

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 3840e1d908..ef0de6574b 100644
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -139,6 +139,7 @@ const char * const known_coded_paper_margins[] = { "leftmargin", "topmargin",
 // default settings
 ostringstream h_preamble;
 string h_textclass               = "article";
+string h_use_default_options     = "false";
 string h_options                 = string();
 string h_language                = "english";
 string h_inputencoding           = "auto";
@@ -557,7 +558,8 @@ void end_preamble(ostream & os, TextClass const & /*textclass*/)
 		os << "\\begin_preamble\n" << h_preamble.str() << "\n\\end_preamble\n";
 	if (!h_options.empty())
 		os << "\\options " << h_options << "\n";
-	os << "\\language " << h_language << "\n"
+	os << "\\use_default_options " << h_use_default_options << "\n"
+	   << "\\language " << h_language << "\n"
 	   << "\\inputencoding " << h_inputencoding << "\n"
 	   << "\\font_roman " << h_font_roman << "\n"
 	   << "\\font_sans " << h_font_sans << "\n"
diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index 9b323b30c0..4bd24155f1 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 = 342;
+int const LYX_FORMAT = 343;
 
 /// path of the master .tex file
 extern std::string getMasterFilePath();