From: Juergen Spitzmueller <spitz@lyx.org>
Date: Wed, 4 Jan 2017 16:11:25 +0000 (+0100)
Subject: Fix default biblio style detection
X-Git-Tag: 2.3.0alpha1~518
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=78eb82103834349a430e13ddc847b000ad6116f0;p=features.git

Fix default biblio style detection
---

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 5c4524b0d4..e96067a985 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -3241,7 +3241,7 @@ bool BufferParams::addCiteEngine(vector<string> const & engine)
 string const & BufferParams::defaultBiblioStyle() const
 {
 	map<string, string> bs = documentClass().defaultBiblioStyle();
-	return bs[documentClass().opt_enginetype()];
+	return bs[theCiteEnginesList.getTypeAsString(citeEngineType())];
 }
 
 
diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 65c547883c..9e71e1c9a7 100644
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -772,9 +772,12 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
 				vector<string>::const_iterator it  = dbs.begin();
 				vector<string>::const_iterator end = dbs.end();
 				for (; it != end; ++it) {
-					if (!contains(*it, ':'))
-						cite_default_biblio_style_[opt_enginetype_] = *it;
-					else {
+					if (!contains(*it, ':')) {
+						vector<string> const enginetypes =
+							getVectorFromString(opt_enginetype_, "|");
+						for (string const &s: enginetypes)
+							cite_default_biblio_style_[s] = *it;
+					} else {
 						string eng;
 						string const db = split(*it, eng, ':');
 						cite_default_biblio_style_[eng] = db;