X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.cpp;h=cbdd7500b6b9e0c4dcc7b03eec19d75b66a1cd71;hb=59449063dfba5f29fe46b8f497ce5d5dffc9b99a;hp=7a6bbb0412f0eba80c8c0f692869865f8460d1fc;hpb=de3e5280f62b1f3efec0ff050d23ae183a010d8d;p=lyx.git

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 7a6bbb0412..cbdd7500b6 100644
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -282,10 +282,11 @@ void initModules()
 		for (; it != end; ++it) {
 			string const module = it->getID();
 			LayoutModuleList m;
+			LayoutModuleList c;
 			vector<string> v;
 			if (!addModule(module, baseClass, m, v))
 				continue;
-			modules[module] = getDocumentClass(baseClass, m);
+			modules[module] = getDocumentClass(baseClass, m, c);
 		}
 		init = false;
 	}
@@ -311,7 +312,7 @@ bool addModule(string const & module)
 	return false;
 }
 
-}
+} // namespace
 
 
 bool checkModule(string const & name, bool command)
@@ -877,6 +878,8 @@ bool tex2lyx(idocstream & is, ostream & os, string const & encoding,
 	context.font.language = preamble.defaultLanguage();
 	// parse the main text
 	parse_text(p, ss, FLAG_END, true, context);
+	// check if we need a commented bibtex inset (biblatex)
+	check_comment_bib(ss, context);
 	if (Context::empty)
 		// Empty document body. LyX needs at least one paragraph.
 		context.check_layout(ss);
@@ -1059,7 +1062,9 @@ int TeX2LyXApp::run()
 		if (configFileNeedsUpdate("lyxrc.defaults") ||
 		    configFileNeedsUpdate("lyxmodules.lst") ||
 		    configFileNeedsUpdate("textclass.lst") ||
-		    configFileNeedsUpdate("packages.lst"))
+		    configFileNeedsUpdate("packages.lst") ||
+		    configFileNeedsUpdate("lyxciteengines.lst") ||
+		    configFileNeedsUpdate("xtemplates.lst"))
 			package().reconfigureUserLyXDir("");
 		fileUnlock(fd, lock_file.c_str());
 	} else
@@ -1178,7 +1183,7 @@ int main(int argc, char * argv[])
 
 	lyx::lyxerr.setStream(cerr);
 
-	os::init(argc, argv);
+	os::init(argc, &argv);
 
 	lyx::TeX2LyXApp app(argc, argv);
 	return app.exec();