#include "Buffer.h"
#include "BufferParams.h"
#include "buffer_funcs.h"
-#include "gettext.h"
#include "InsetIterator.h"
#include "Paragraph.h"
#include "insets/InsetBibtex.h"
#include "insets/InsetInclude.h"
-#include "support/lstrings.h"
+#include "support/lassert.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;
+namespace lyx {
//////////////////////////////////////////////////////////////////////
//
//
//////////////////////////////////////////////////////////////////////
-BibTeXInfo::BibTeXInfo()
- : isBibTeX(true)
+BibTeXInfo::BibTeXInfo(docstring const & key, docstring const & type)
+ : is_bibtex_(true), bib_key_(key), entry_type_(type)
{}
-
+
bool BibTeXInfo::hasField(docstring const & field) const
{
return count(field) == 1;
}
-static docstring familyName(docstring const & name)
+docstring familyName(docstring const & name)
{
if (name.empty())
return docstring();
docstring const BibTeXInfo::getAbbreviatedAuthor() const
{
- if (!isBibTeX)
+ if (!is_bibtex_)
return docstring();
docstring author = getValueForField("author");
if (author.empty()) {
author = getValueForField("editor");
if (author.empty())
- return bibKey;
+ return bib_key_;
}
// OK, we've got some names. Let's format them.
docstring const BibTeXInfo::getYear() const
{
- if (!isBibTeX)
+ if (!is_bibtex_)
return docstring();
docstring year = getValueForField("year");
docstring const BibTeXInfo::getInfo() const
{
- if (!isBibTeX) {
+ if (!is_bibtex_) {
BibTeXInfo::const_iterator it = find(from_ascii("ref"));
return it->second;
}
//////////////////////////////////////////////////////////////////////
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 {
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;
}
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;
}
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;
}
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)
+ CiteEngine const engine = buf.params().citeEngine();
+ if (engine == ENGINE_BASIC || engine == ENGINE_NATBIB_NUMERICAL)
return getNumericalStrings(key, buf);
else
return getAuthorYearStrings(key, buf);
if (author.empty() || year.empty())
return vector<docstring>();
- vector<biblio::CiteStyle> const & styles =
- biblio::getCiteStyles(buf.params().getEngine());
+ vector<CiteStyle> const & styles = citeStyles(buf.params().citeEngine());
vector<docstring> vec(styles.size());
for (size_t i = 0; i != vec.size(); ++i) {
docstring str;
switch (styles[i]) {
- case biblio::CITE:
- case biblio::CITEP:
+ case CITE:
+ case CITEP:
str = from_ascii("[#ID]");
break;
- case biblio::CITET:
+ case NOCITE:
+ str = _("Add to bibliography only.");
+ break;
+
+ case CITET:
str = author + " [#ID]";
break;
- case biblio::CITEALT:
+ case CITEALT:
str = author + " #ID";
break;
- case biblio::CITEALP:
+ case CITEALP:
str = from_ascii("#ID");
break;
- case biblio::CITEAUTHOR:
+ case CITEAUTHOR:
str = author;
break;
- case biblio::CITEYEAR:
+ case CITEYEAR:
str = year;
break;
- case biblio::CITEYEARPAR:
+ case CITEYEARPAR:
str = '(' + year + ')';
break;
}
if (author.empty() || year.empty())
return vector<docstring>();
- vector<biblio::CiteStyle> const & styles =
- getCiteStyles(buf.params().getEngine());
+ vector<CiteStyle> const & styles = citeStyles(buf.params().citeEngine());
vector<docstring> vec(styles.size());
- for (vector<docstring>::size_type i = 0; i != vec.size(); ++i) {
+ for (size_t i = 0; i != vec.size(); ++i) {
docstring str;
switch (styles[i]) {
- case biblio::CITE:
+ case CITE:
// jurabib only: Author/Annotator
// (i.e. the "before" field, 2nd opt arg)
str = author + "/<" + _("before") + '>';
break;
- case biblio::CITET:
+ case NOCITE:
+ str = _("Add to bibliography only.");
+ break;
+
+ case CITET:
str = author + " (" + year + ')';
break;
- case biblio::CITEP:
+ case CITEP:
str = '(' + author + ", " + year + ')';
break;
- case biblio::CITEALT:
+ case CITEALT:
str = author + ' ' + year ;
break;
- case biblio::CITEALP:
+ case CITEALP:
str = author + ", " + year ;
break;
- case biblio::CITEAUTHOR:
+ case CITEAUTHOR:
str = author;
break;
- case biblio::CITEYEAR:
+ case CITEYEAR:
str = year;
break;
- case biblio::CITEYEARPAR:
+ case CITEYEARPAR:
str = '(' + year + ')';
break;
}
}
-void BiblioInfo::fillWithBibKeys(Buffer const * const buf)
-{
- /// if this is a child document and the parent is already loaded
- /// use the parent's list instead [ale990412]
- Buffer const * const tmp = buf->masterBuffer();
- BOOST_ASSERT(tmp);
- if (tmp != buf) {
- this->fillWithBibKeys(tmp);
- return;
- }
-
- // Pre-load all child documents.
- buf->loadChildDocuments();
-
- for (InsetIterator it = inset_iterator_begin(buf->inset()); it; ++it)
- it->fillWithBibKeys(*buf, *this, it);
+void BiblioInfo::mergeBiblioInfo(BiblioInfo const & info)
+{
+ bimap_.insert(info.begin(), info.end());
}
-namespace biblio {
-
//////////////////////////////////////////////////////////////////////
//
// CitationStyle
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 };
+CiteStyle const citeStylesArray[] = {
+ CITE, NOCITE, CITET, CITEP, CITEALT,
+ CITEALP, CITEAUTHOR, CITEYEAR, CITEYEARPAR };
unsigned int const nCiteStyles =
- sizeof(citeStyles) / sizeof(CiteStyle);
+ sizeof(citeStylesArray) / sizeof(CiteStyle);
CiteStyle const citeStylesFull[] = {
CITET, CITEP, CITEALT, CITEALP, CITEAUTHOR };
} // namespace anon
-CitationStyle::CitationStyle(string const & command)
- : style(CITE), full(false), forceUCase(false)
+CitationStyle citationStyleFromString(string const & command)
{
+ CitationStyle s;
if (command.empty())
- return;
+ return s;
string cmd = command;
if (cmd[0] == 'C') {
- forceUCase = true;
+ s.forceUpperCase = true;
cmd[0] = 'c';
}
- string::size_type const n = cmd.size() - 1;
+ size_t const n = cmd.size() - 1;
if (cmd != "cite" && cmd[n] == '*') {
- full = true;
+ s.full = true;
cmd = cmd.substr(0,n);
}
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;
- style = citeStyles[idx];
+ s.style = citeStylesArray[idx];
}
+ return s;
}
-string const CitationStyle::asLatexStr() const
+string citationStyleToString(const CitationStyle & s)
{
- string cite = citeCommands[style];
- if (full) {
+ string cite = citeCommands[s.style];
+ if (s.full) {
CiteStyle const * last = citeStylesFull + nCiteStylesFull;
- if (std::find(citeStylesFull, last, style) != last)
+ if (find(citeStylesFull, last, s.style) != last)
cite += '*';
}
- if (forceUCase) {
+ if (s.forceUpperCase) {
CiteStyle const * last = citeStylesUCase + nCiteStylesUCase;
- if (std::find(citeStylesUCase, last, style) != last)
+ if (find(citeStylesUCase, last, s.style) != last)
cite[0] = 'C';
}
return cite;
}
-
-vector<CiteStyle> const getCiteStyles(CiteEngine const engine)
+vector<CiteStyle> citeStyles(CiteEngine engine)
{
unsigned int nStyles = 0;
unsigned int start = 0;
switch (engine) {
case ENGINE_BASIC:
- nStyles = 1;
+ nStyles = 2;
start = 0;
break;
case ENGINE_NATBIB_AUTHORYEAR:
break;
}
- typedef vector<CiteStyle> cite_vec;
-
- cite_vec styles(nStyles);
+ vector<CiteStyle> styles(nStyles);
size_t i = 0;
int j = start;
for (; i != styles.size(); ++i, ++j)
- styles[i] = citeStyles[j];
+ styles[i] = citeStylesArray[j];
return styles;
}
-} // namespace biblio
} // namespace lyx
projects / lyx.git / blobdiff