X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FPreamble.cpp;h=bb74519f57d958250e2e9fbc8b06ab94f84549b1;hb=1a073ea416674ed37b65a333126a65369a2882be;hp=e757bc7c8336898970967d48df8da269a055f03a;hpb=c669b6f4d2ecd01d009e195fc37033f6cf75e113;p=lyx.git

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index e757bc7c83..bb74519f57 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -21,6 +21,7 @@
 #include "Layout.h"
 #include "Lexer.h"
 #include "TextClass.h"
+#include "version.h"
 
 #include "support/convert.h"
 #include "support/FileName.h"
@@ -132,9 +133,6 @@ const char * const known_sans_fonts[] = { "avant", "berasans", "biolinum-type1",
 "cmbr", "cmss", "helvet", "iwona", "iwonac", "iwonal", "iwonalc", "kurier",
 "kurierc", "kurierl", "kurierlc", "lmss", "tgadventor", "tgheros", 0};
 
-const char * const known_kurier_fonts[] = { "kurier", "kurierl",
-"kurier-condensed", "kurier-light-condensed", 0};
-
 const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
 "courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
 "newcent", "tgcursor", "txtt", 0};
@@ -304,10 +302,10 @@ const char * const Preamble::polyglossia_languages[] = {
 "armenian", "divehi", "interlingua", "polish", "telugu", "asturian", "dutch",
 "irish", "portuges", "thai", "bahasai", "english", "italian", "romanian", "turkish",
 "bahasam", "esperanto", "lao", "russian", "turkmen", "basque", "estonian", "latin",
-"samin", "ukrainian", "bengali", "farsi", "latvian", "sanskrit", "urdu", "brazil",
-"brazilian", "finnish", "lithuanian", "scottish", "usorbian", "breton", "french",
-"lsorbian", "serbian", "vietnamese", "bulgarian", "galician", "magyar", "slovak",
-"welsh", "catalan", "german", "malayalam", "slovenian", "coptic", "greek",
+"samin", "ukrainian", "bengali", "farsi", "latvian", "sanskrit", "tibetan", "urdu",
+"brazil", "brazilian", "finnish", "lithuanian", "scottish", "usorbian", "breton", 
+"french", "lsorbian", "serbian", "vietnamese", "bulgarian", "galician", "magyar",
+"slovak", "welsh", "catalan", "german", "malayalam", "slovenian", "coptic", "greek",
 "marathi", "spanish",
 "american", "ancient", "australian", "british", "monotonic", "newzealand",
 "polytonic", 0};
@@ -322,10 +320,10 @@ const char * const Preamble::coded_polyglossia_languages[] = {
 "armenian", "divehi", "interlingua", "polish", "telugu", "asturian", "dutch",
 "irish", "portuges", "thai", "bahasa", "english", "italian", "romanian", "turkish",
 "bahasam", "esperanto", "lao", "russian", "turkmen", "basque", "estonian", "latin",
-"samin", "ukrainian", "bengali", "farsi", "latvian", "sanskrit", "urdu", "brazilian",
-"brazilian", "finnish", "lithuanian", "scottish", "uppersorbian", "breton", "french",
-"lowersorbian", "serbian", "vietnamese", "bulgarian", "galician", "magyar", "slovak",
-"welsh", "catalan", "ngerman", "malayalam", "slovene", "coptic", "greek",
+"samin", "ukrainian", "bengali", "farsi", "latvian", "sanskrit", "tibetan", "urdu",
+"brazilian", "brazilian", "finnish", "lithuanian", "scottish", "uppersorbian", "breton",
+"french", "lowersorbian", "serbian", "vietnamese", "bulgarian", "galician", "magyar",
+"slovak", "welsh", "catalan", "ngerman", "malayalam", "slovene", "coptic", "greek",
 "marathi", "spanish",
 "american", "ancientgreek", "australian", "british", "greek", "newzealand",
 "polutonikogreek", 0};
@@ -451,7 +449,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false),
 	h_biblio_style            = "plain";
 	h_bibtex_command          = "default";
 	h_cite_engine             = "basic";
-	h_cite_engine_type        = "numerical";
+	h_cite_engine_type        = "default";
 	h_color                   = "#008000";
 	h_defskip                 = "medskip";
 	//h_float_placement;
@@ -499,7 +497,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false),
 	//h_pdf_author;
 	//h_pdf_subject;
 	//h_pdf_keywords;
-	h_pdf_bookmarks           = "1";
+	h_pdf_bookmarks           = "0";
 	h_pdf_bookmarksnumbered   = "0";
 	h_pdf_bookmarksopen       = "0";
 	h_pdf_bookmarksopenlevel  = "1";
@@ -507,7 +505,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false),
 	h_pdf_pdfborder           = "0";
 	h_pdf_colorlinks          = "0";
 	h_pdf_backref             = "section";
-	h_pdf_pdfusetitle         = "1";
+	h_pdf_pdfusetitle         = "0";
 	//h_pdf_pagemode;
 	//h_pdf_quoted_options;
 	h_quotes_language         = "english";
@@ -959,6 +957,18 @@ void Preamble::handle_package(Parser &p, string const & name,
 	else if (name == "hyperref")
 		handle_hyperref(options);
 
+	else if (name == "algorithm2e") {
+		// Load "algorithm2e" module
+		addModule("algorithm2e");
+		// Add the package options to the global document options
+		if (!options.empty()) {
+			if (h_options.empty())
+				h_options = join(options, ",");
+			else
+				h_options += ',' + join(options, ",");
+		}
+	}
+
 	else if (!in_lyx_preamble) {
 		if (options.empty())
 			h_preamble << "\\usepackage{" << name << '}';
@@ -1040,7 +1050,10 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc)
 	}
 
 	// output the LyX file settings
-	os << "#LyX file created by tex2lyx " << PACKAGE_VERSION << "\n"
+	// Important: Keep the version formatting in sync with LyX and
+	//            lyx2lyx (bug 7951)
+	os << "#LyX file created by tex2lyx " << lyx_version_major << '.'
+	   << lyx_version_minor << '\n'
 	   << "\\lyxformat " << LYX_FORMAT << '\n'
 	   << "\\begin_document\n"
 	   << "\\begin_header\n"