Revert 23154.

[lyx.git] / src / BiblioInfo.cpp

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 4718d37ed27c1575edfded80a31d0727fa3f4213..2c21aa9d4492926cb6f291b2415d5680f2900396 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -16,7 +16,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "buffer_funcs.h"
-#include "gettext.h"
 #include "InsetIterator.h"
 #include "Paragraph.h"
 
@@ -25,24 +24,17 @@
 #include "insets/InsetBibtex.h"
 #include "insets/InsetInclude.h"
 
-#include "support/lstrings.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include "boost/regex.hpp"
 
-using std::string;
-using std::vector;
-using std::pair;
-using std::endl;
-using std::set;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::compare_no_case;
-using support::getVectorFromString;
-using support::ltrim;
-using support::rtrim;
 
 //////////////////////////////////////////////////////////////////////
 //
@@ -50,8 +42,13 @@ using support::rtrim;
 //
 //////////////////////////////////////////////////////////////////////
 
-BibTeXInfo::BibTeXInfo()
-       : isBibTeX(true)
+BibTeXInfo::BibTeXInfo(bool ib)
+       : is_bibtex_(ib)
+{}
+
+       
+BibTeXInfo::BibTeXInfo(docstring const & key, docstring const & type)
+       : is_bibtex_(true), bib_key_(key), entry_type_(type)
 {}
 
        
@@ -105,7 +102,7 @@ static docstring familyName(docstring const & name)
 
 docstring const BibTeXInfo::getAbbreviatedAuthor() const
 {
-       if (!isBibTeX) 
+       if (!is_bibtex_) 
                return docstring();
  
        docstring author = getValueForField("author");
@@ -113,7 +110,7 @@ docstring const BibTeXInfo::getAbbreviatedAuthor() const
        if (author.empty()) {
                author = getValueForField("editor");
                if (author.empty())
-                       return bibKey;
+                       return bib_key_;
        }
 
        // OK, we've got some names. Let's format them.
@@ -134,7 +131,7 @@ docstring const BibTeXInfo::getAbbreviatedAuthor() const
 
 docstring const BibTeXInfo::getYear() const
 {
-       if (!isBibTeX) 
+       if (!is_bibtex_) 
                return docstring();
  
        docstring year = getValueForField("year");
@@ -146,7 +143,7 @@ docstring const BibTeXInfo::getYear() const
 
 docstring const BibTeXInfo::getInfo() const
 {
-       if (!isBibTeX) {
+       if (!is_bibtex_) {
                BibTeXInfo::const_iterator it = find(from_ascii("ref"));
                return it->second;
        }
@@ -210,8 +207,8 @@ docstring const BibTeXInfo::getInfo() const
 //////////////////////////////////////////////////////////////////////
 
 namespace {
-// A functor for use with std::sort, leading to case insensitive sorting
-       class compareNoCase: public std::binary_function<docstring, docstring, bool>
+// A functor for use with sort, leading to case insensitive sorting
+       class compareNoCase: public binary_function<docstring, docstring, bool>
        {
                public:
                        bool operator()(docstring const & s1, docstring const & s2) const {
@@ -227,7 +224,7 @@ vector<docstring> const BiblioInfo::getKeys() const
        BiblioInfo::const_iterator it  = begin();
        for (; it != end(); ++it)
                bibkeys.push_back(it->first);
-       std::sort(bibkeys.begin(), bibkeys.end(), compareNoCase());
+       sort(bibkeys.begin(), bibkeys.end(), compareNoCase());
        return bibkeys;
 }
 
@@ -235,11 +232,11 @@ vector<docstring> const BiblioInfo::getKeys() const
 vector<docstring> const BiblioInfo::getFields() const
 {
        vector<docstring> bibfields;
-       set<docstring>::const_iterator it = fieldNames.begin();
-       set<docstring>::const_iterator end = fieldNames.end();
+       set<docstring>::const_iterator it = field_names_.begin();
+       set<docstring>::const_iterator end = field_names_.end();
        for (; it != end; ++it)
                bibfields.push_back(*it);
-       std::sort(bibfields.begin(), bibfields.end());
+       sort(bibfields.begin(), bibfields.end());
        return bibfields;
 }
 
@@ -247,11 +244,11 @@ vector<docstring> const BiblioInfo::getFields() const
 vector<docstring> const BiblioInfo::getEntries() const
 {
        vector<docstring> bibentries;
-       set<docstring>::const_iterator it = entryTypes.begin();
-       set<docstring>::const_iterator end = entryTypes.end();
+       set<docstring>::const_iterator it = entry_types_.begin();
+       set<docstring>::const_iterator end = entry_types_.end();
        for (; it != end; ++it)
                bibentries.push_back(*it);
-       std::sort(bibentries.begin(), bibentries.end());
+       sort(bibentries.begin(), bibentries.end());
        return bibentries;
 }
 
@@ -290,7 +287,8 @@ vector<docstring> const BiblioInfo::getCiteStrings(
        docstring const & key, Buffer const & buf) const
 {
        biblio::CiteEngine const engine = buf.params().getEngine();
-       if (engine == biblio::ENGINE_NATBIB_NUMERICAL)
+       if (engine == biblio::ENGINE_BASIC || 
+           engine == biblio::ENGINE_NATBIB_NUMERICAL)
                return getNumericalStrings(key, buf);
        else
                return getAuthorYearStrings(key, buf);
@@ -312,7 +310,7 @@ vector<docstring> const BiblioInfo::getNumericalStrings(
                biblio::getCiteStyles(buf.params().getEngine());
        
        vector<docstring> vec(styles.size());
-       for (size_t i = 0; i != vec.size(); ++i) {
+       for (vector<docstring>::size_type i = 0; i != vec.size(); ++i) {
                docstring str;
 
                switch (styles[i]) {
@@ -321,6 +319,10 @@ vector<docstring> const BiblioInfo::getNumericalStrings(
                                str = from_ascii("[#ID]");
                                break;
 
+                       case biblio::NOCITE:
+                               str = _("Add to bibliography only.");
+                               break;
+
                        case biblio::CITET:
                                str = author + " [#ID]";
                                break;
@@ -378,6 +380,10 @@ vector<docstring> const BiblioInfo::getAuthorYearStrings(
                                str = author + "/<" + _("before") + '>';
                                break;
 
+                       case biblio::NOCITE:
+                               str = _("Add to bibliography only.");
+                               break;
+
                        case biblio::CITET:
                                str = author + " (" + year + ')';
                                break;
@@ -443,15 +449,15 @@ namespace {
 
 
 char const * const citeCommands[] = {
-       "cite", "citet", "citep", "citealt", "citealp", "citeauthor",
-       "citeyear", "citeyearpar" };
+       "cite", "nocite", "citet", "citep", "citealt", "citealp",
+       "citeauthor", "citeyear", "citeyearpar" };
 
 unsigned int const nCiteCommands =
                sizeof(citeCommands) / sizeof(char *);
 
 CiteStyle const citeStyles[] = {
-       CITE, CITET, CITEP, CITEALT, CITEALP,
-CITEAUTHOR, CITEYEAR, CITEYEARPAR };
+       CITE, NOCITE, CITET, CITEP, CITEALT,
+CITEALP, CITEAUTHOR, CITEYEAR, CITEYEARPAR };
 
 unsigned int const nCiteStyles =
                sizeof(citeStyles) / sizeof(CiteStyle);
@@ -490,7 +496,7 @@ CitationStyle::CitationStyle(string const & command)
        }
 
        char const * const * const last = citeCommands + nCiteCommands;
-       char const * const * const ptr = std::find(citeCommands, last, cmd);
+       char const * const * const ptr = find(citeCommands, last, cmd);
 
        if (ptr != last) {
                size_t idx = ptr - citeCommands;
@@ -504,13 +510,13 @@ string const CitationStyle::asLatexStr() const
        string cite = citeCommands[style];
        if (full) {
                CiteStyle const * last = citeStylesFull + nCiteStylesFull;
-               if (std::find(citeStylesFull, last, style) != last)
+               if (find(citeStylesFull, last, style) != last)
                        cite += '*';
        }
 
        if (forceUCase) {
                CiteStyle const * last = citeStylesUCase + nCiteStylesUCase;
-               if (std::find(citeStylesUCase, last, style) != last)
+               if (find(citeStylesUCase, last, style) != last)
                        cite[0] = 'C';
        }
 
@@ -525,7 +531,7 @@ vector<CiteStyle> const getCiteStyles(CiteEngine const engine)
 
        switch (engine) {
                case ENGINE_BASIC:
-                       nStyles = 1;
+                       nStyles = 2;
                        start = 0;
                        break;
                case ENGINE_NATBIB_AUTHORYEAR: