Author: jrioux
Date: Tue Oct 11 20:33:35 2011
New Revision: 39830
URL: http://www.lyx.org/trac/changeset/39830
Log:
Allow \nocite again with the basic citation engine (backport r39777).
Fix a bug introduced in r26547. Also reorders the entries for
natbib-numerical into a more natural, visually pleasing order.
Modified:
lyx-devel/branches/BRANCH_2_0_X/ (props changed)
lyx-devel/branches/BRANCH_2_0_X/src/BiblioInfo.cpp
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/BiblioInfo.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/BiblioInfo.cpp Tue Oct 11 20:22:06
2011 (r39829)
+++ lyx-devel/branches/BRANCH_2_0_X/src/BiblioInfo.cpp Tue Oct 11 20:33:35
2011 (r39830)
@@ -1033,30 +1033,35 @@
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;
}
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Tue Oct 11 20:22:06 2011
(r39829)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Tue Oct 11 20:33:35 2011
(r39830)
@@ -146,6 +146,8 @@
- Don't allow copy-pasting newline characters in Document->Settings
and Tools->Preferences (bug 5840).
+- Allow the \nocite LaTeX command when using the basic citation engine.
+
* ADVANCED FIND AND REPLACE
