From: Julien Rioux <jrioux@lyx.org>
Date: Tue, 27 Sep 2011 17:13:07 +0000 (+0000)
Subject: Allow \nocite again with the basic citation engine.
X-Git-Tag: 2.1.0beta1~2644
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=772325ff70c341a2cff1201efb29f75871cc371d;p=lyx.git

Allow \nocite again with the basic citation engine.

Fix a bug introduced in r26547. Also reorders the entries for
natbib-numerical into a more natural, visually pleasing order.

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

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index c031058aa3..0df795e506 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -1033,30 +1033,35 @@ string citationStyleToString(const CitationStyle & s)
 
 vector<CiteStyle> citeStyles(CiteEngine engine)
 {
-	unsigned int nStyles = 0;
-	unsigned int start = 0;
+	vector<CiteStyle> styles(0);
 
 	switch (engine) {
 		case ENGINE_BASIC:
-			nStyles = 2;
-			start = 0;
+			styles.push_back(CITE);
 			break;
+		case ENGINE_JURABIB:
+			styles.push_back(CITE);
 		case ENGINE_NATBIB_AUTHORYEAR:
-		case ENGINE_NATBIB_NUMERICAL:
-			nStyles = nCiteStyles - 1;
-			start = 1;
+			styles.push_back(CITET);
+			styles.push_back(CITEP);
+			styles.push_back(CITEALT);
+			styles.push_back(CITEALP);
+			styles.push_back(CITEAUTHOR);
+			styles.push_back(CITEYEAR);
+			styles.push_back(CITEYEARPAR);
 			break;
-		case ENGINE_JURABIB:
-			nStyles = nCiteStyles;
-			start = 0;
+		case ENGINE_NATBIB_NUMERICAL:
+			styles.push_back(CITET);
+			styles.push_back(CITEALT);
+			styles.push_back(CITEAUTHOR);
+			styles.push_back(CITEP);
+			styles.push_back(CITEALP);
+			styles.push_back(CITEYEAR);
+			styles.push_back(CITEYEARPAR);
 			break;
 	}
 
-	vector<CiteStyle> styles(nStyles);
-	size_t i = 0;
-	int j = start;
-	for (; i != styles.size(); ++i, ++j)
-		styles[i] = citeStylesArray[j];
+	styles.push_back(NOCITE);
 
 	return styles;
 }