* Licence details can be found in the file COPYING.
*
* \author Angus Leeming
- * \author Herbert Voß
+ * \author Herbert Voß
* \author Richard Heck
*
* Full author contact details are available in file CREDITS.
#include "Buffer.h"
#include "BufferParams.h"
#include "buffer_funcs.h"
-#include "gettext.h"
+#include "Encoding.h"
#include "InsetIterator.h"
#include "Paragraph.h"
#include "insets/InsetBibtex.h"
#include "insets/InsetInclude.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lassert.h"
#include "support/lstrings.h"
+#include "support/textutils.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 {
+
+// gets the "family name" from an author-type string
+docstring familyName(docstring const & name)
+{
+ if (name.empty())
+ return docstring();
+
+ // first we look for a comma, and take the last name to be everything
+ // preceding the right-most one, so that we also get the "jr" part.
+ docstring::size_type idx = name.rfind(',');
+ if (idx != docstring::npos)
+ return ltrim(name.substr(0, idx));
+
+ // OK, so now we want to look for the last name. We're going to
+ // include the "von" part. This isn't perfect.
+ // Split on spaces, to get various tokens.
+ vector<docstring> pieces = getVectorFromString(name, from_ascii(" "));
+ // If we only get two, assume the last one is the last name
+ if (pieces.size() <= 2)
+ return pieces.back();
+
+ // Now we look for the first token that begins with a lower case letter.
+ vector<docstring>::const_iterator it = pieces.begin();
+ vector<docstring>::const_iterator en = pieces.end();
+ for (; it != en; ++it) {
+ if ((*it).size() == 0)
+ continue;
+ char_type const c = (*it)[0];
+ if (isLower(c))
+ break;
+ }
+
+ if (it == en) // we never found a "von"
+ return pieces.back();
+
+ // reconstruct what we need to return
+ docstring retval;
+ bool first = true;
+ for (; it != en; ++it) {
+ if (!first)
+ retval += " ";
+ else
+ first = false;
+ retval += *it;
+ }
+ return retval;
+}
+
+// converts a string containing LaTeX commands into unicode
+// for display.
+docstring convertLaTeXCommands(docstring const & str)
+{
+ docstring val = str;
+ docstring ret;
+
+ bool scanning_cmd = false;
+ bool scanning_math = false;
+ bool escaped = false; // used to catch \$, etc.
+ while (val.size()) {
+ char_type const ch = val[0];
+
+ // if we're scanning math, we output everything until we
+ // find an unescaped $, at which point we break out.
+ if (scanning_math) {
+ if (escaped)
+ escaped = false;
+ else if (ch == '\\')
+ escaped = true;
+ else if (ch == '$')
+ scanning_math = false;
+ ret += ch;
+ val = val.substr(1);
+ continue;
+ }
+
+ // if we're scanning a command name, then we just
+ // discard characters until we hit something that
+ // isn't alpha.
+ if (scanning_cmd) {
+ if (isAlphaASCII(ch)) {
+ val = val.substr(1);
+ escaped = false;
+ continue;
+ }
+ // so we're done with this command.
+ // now we fall through and check this character.
+ scanning_cmd = false;
+ }
+
+ // was the last character a \? If so, then this is something like:
+ // \\ or \$, so we'll just output it. That's probably not always right...
+ if (escaped) {
+ // exception: output \, as THIN SPACE
+ if (ch == ',')
+ ret.push_back(0x2009);
+ else
+ ret += ch;
+ val = val.substr(1);
+ escaped = false;
+ continue;
+ }
+
+ if (ch == '$') {
+ ret += ch;
+ val = val.substr(1);
+ scanning_math = true;
+ continue;
+ }
+
+ // we just ignore braces
+ if (ch == '{' || ch == '}') {
+ val = val.substr(1);
+ continue;
+ }
+
+ // we're going to check things that look like commands, so if
+ // this doesn't, just output it.
+ if (ch != '\\') {
+ ret += ch;
+ val = val.substr(1);
+ continue;
+ }
+
+ // ok, could be a command of some sort
+ // let's see if it corresponds to some unicode
+ // unicodesymbols has things in the form: \"{u},
+ // whereas we may see things like: \"u. So we'll
+ // look for that and change it, if necessary.
+ static boost::regex const reg("^\\\\\\W\\w");
+ if (boost::regex_search(to_utf8(val), reg)) {
+ val.insert(3, from_ascii("}"));
+ val.insert(2, from_ascii("{"));
+ }
+ docstring rem;
+ docstring const cnvtd = Encodings::fromLaTeXCommand(val, rem,
+ Encodings::TEXT_CMD);
+ if (!cnvtd.empty()) {
+ // it did, so we'll take that bit and proceed with what's left
+ ret += cnvtd;
+ val = rem;
+ continue;
+ }
+ // it's a command of some sort
+ scanning_cmd = true;
+ escaped = true;
+ val = val.substr(1);
+ }
+ return ret;
+}
+
+} // anon namespace
+
+
+//////////////////////////////////////////////////////////////////////
//
// BibTeXInfo
//
-////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
-BibTeXInfo::BibTeXInfo() : isBibTeX(true)
+BibTeXInfo::BibTeXInfo(docstring const & key, docstring const & type)
+ : is_bibtex_(true), bib_key_(key), entry_type_(type), info_()
{}
-
+
bool BibTeXInfo::hasField(docstring const & field) const
{
return count(field) == 1;
}
-docstring const & BibTeXInfo::getValueForField(docstring const & field) const
-{
- BibTeXInfo::const_iterator it = find(field);
- if (it != end())
- return it->second;
- static docstring const empty_value = docstring();
- return empty_value;
-}
-
-
-docstring const & BibTeXInfo::getValueForField(string const & field) const
+docstring const BibTeXInfo::getAbbreviatedAuthor() const
{
- return getValueForField(from_ascii(field));
-}
-
-
-namespace {
- docstring const familyName(docstring const & name)
- {
- if (name.empty())
+ if (!is_bibtex_) {
+ docstring const opt = label();
+ if (opt.empty())
return docstring();
- // Very simple parser
- docstring fname = name;
-
- // possible authorname combinations are:
- // "Surname, FirstName"
- // "Surname, F."
- // "FirstName Surname"
- // "F. Surname"
- docstring::size_type idx = fname.find(',');
- if (idx != docstring::npos)
- return ltrim(fname.substr(0, idx));
- idx = fname.rfind('.');
- if (idx != docstring::npos && idx + 1 < fname.size())
- fname = ltrim(fname.substr(idx + 1));
- // test if we have a LaTeX Space in front
- if (fname[0] == '\\')
- return fname.substr(2);
- return rtrim(fname);
+ docstring authors;
+ split(opt, authors, '(');
+ return authors;
}
-} // namespace anon
-
-
-docstring const BibTeXInfo::getAbbreviatedAuthor() const
-{
- if (!isBibTeX)
- return docstring();
-
- docstring author = getValueForField("author");
-
+ docstring author = convertLaTeXCommands(operator[]("author"));
if (author.empty()) {
- author = getValueForField("editor");
+ author = convertLaTeXCommands(operator[]("editor"));
if (author.empty())
- return bibKey;
+ return bib_key_;
}
- //OK, we've got some names. Let's format them.
- //Try to split the author list on " and "
+ // OK, we've got some names. Let's format them.
+ // Try to split the author list on " and "
vector<docstring> const authors =
getVectorFromString(author, from_ascii(" and "));
-
+
if (authors.size() == 2)
return bformat(_("%1$s and %2$s"),
familyName(authors[0]), familyName(authors[1]));
- else if (authors.size() > 2)
+
+ if (authors.size() > 2)
return bformat(_("%1$s et al."), familyName(authors[0]));
- else
- return familyName(authors[0]);
+
+ return familyName(authors[0]);
}
+
docstring const BibTeXInfo::getYear() const
{
- if (!isBibTeX)
+ if (is_bibtex_)
+ return operator[]("year");
+
+ docstring const opt = label();
+ if (opt.empty())
return docstring();
-
- docstring year = getValueForField("year");
- if (year.empty())
- year = _("No year");
+
+ docstring authors;
+ docstring const tmp = split(opt, authors, '(');
+ docstring year;
+ split(tmp, year, ')');
return year;
}
-docstring const BibTeXInfo::getInfo() const
+docstring const BibTeXInfo::getXRef() const
+{
+ if (!is_bibtex_)
+ return docstring();
+ return operator[]("crossref");
+}
+
+
+docstring const & BibTeXInfo::getInfo(BibTeXInfo const * const xref) const
{
- if (!isBibTeX) {
+ if (!info_.empty())
+ return info_;
+
+ if (!is_bibtex_) {
BibTeXInfo::const_iterator it = find(from_ascii("ref"));
- return it->second;
+ info_ = it->second;
+ return info_;
}
- //FIXME
- //This could be made alot better using the entryType
- //field to customize the output based upon entry type.
+ // FIXME
+ // This could be made a lot better using the entry_type_
+ // field to customize the output based upon entry type.
- //Search for all possible "required" fields
- docstring author = getValueForField("author");
+ // Search for all possible "required" fields
+ docstring author = getValueForKey("author", xref);
if (author.empty())
- author = getValueForField("editor");
+ author = getValueForKey("editor", xref);
- docstring year = getValueForField("year");
- docstring title = getValueForField("title");
- docstring docLoc = getValueForField("pages");
+ docstring year = getValueForKey("year", xref);
+ docstring title = getValueForKey("title", xref);
+ docstring docLoc = getValueForKey("pages", xref);
if (docLoc.empty()) {
- docLoc = getValueForField("chapter");
+ docLoc = getValueForKey("chapter", xref);
if (!docLoc.empty())
- docLoc = from_ascii("Ch. ") + docLoc;
- } else
- docLoc = from_ascii("pp. ") + docLoc;
- docstring media = getValueForField("journal");
+ docLoc = _("Ch. ") + docLoc;
+ } else {
+ docLoc = _("pp. ") + docLoc;
+ }
+
+ docstring media = getValueForKey("journal", xref);
+ if (media.empty()) {
+ media = getValueForKey("publisher", xref);
if (media.empty()) {
- media = getValueForField("publisher");
- if (media.empty()) {
- media = getValueForField("school");
- if (media.empty())
- media = getValueForField("institution");
- }
+ media = getValueForKey("school", xref);
+ if (media.empty())
+ media = getValueForKey("institution");
}
- docstring volume = getValueForField("volume");
-
- odocstringstream result;
- if (!author.empty())
- result << author << ", ";
- if (!title.empty())
- result << title;
- if (!media.empty())
- result << ", " << media;
- if (!year.empty())
- result << ", " << year;
- if (!docLoc.empty())
- result << ", " << docLoc;
-
- docstring const result_str = rtrim(result.str());
- if (!result_str.empty())
- return result_str;
-
- // This should never happen (or at least be very unusual!)
- return docstring();
+ }
+ docstring volume = getValueForKey("volume", xref);
+
+ odocstringstream result;
+ if (!author.empty())
+ result << author << ", ";
+ if (!title.empty())
+ result << title;
+ if (!media.empty())
+ result << ", " << media;
+ if (!year.empty())
+ result << " (" << year << ")";
+ if (!docLoc.empty())
+ result << ", " << docLoc;
+
+ docstring const result_str = rtrim(result.str());
+ if (!result_str.empty()) {
+ info_ = convertLaTeXCommands(result_str);
+ return info_;
+ }
+
+ // This should never happen (or at least be very unusual!)
+ static docstring e = docstring();
+ return e;
+}
+
+
+docstring const & BibTeXInfo::operator[](docstring const & field) const
+{
+ BibTeXInfo::const_iterator it = find(field);
+ if (it != end())
+ return it->second;
+ static docstring const empty_value = docstring();
+ return empty_value;
+}
+
+
+docstring const & BibTeXInfo::operator[](string const & field) const
+{
+ return operator[](from_ascii(field));
+}
+
+
+docstring BibTeXInfo::getValueForKey(string const & key,
+ BibTeXInfo const * const xref) const
+{
+ docstring const ret = operator[](key);
+ if (!ret.empty() || !xref)
+ return ret;
+ return (*xref)[key];
}
-////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
//
// BiblioInfo
//
-////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
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;
}
if (it == end())
return docstring();
BibTeXInfo const & data = it->second;
+ docstring year = data.getYear();
+ if (!year.empty())
+ return year;
+ // let's try the crossref
+ docstring const xref = data.getXRef();
+ if (xref.empty())
+ return _("No year"); // no luck
+ BiblioInfo::const_iterator const xrefit = find(xref);
+ if (xrefit == end())
+ return _("No year"); // no luck again
+ BibTeXInfo const & xref_data = xrefit->second;
+ return xref_data.getYear();
return data.getYear();
}
if (it == end())
return docstring();
BibTeXInfo const & data = it->second;
- return data.getInfo();
+ BibTeXInfo const * xrefptr = 0;
+ docstring const xref = data.getXRef();
+ if (!xref.empty()) {
+ BiblioInfo::const_iterator const xrefit = find(xref);
+ if (xrefit != end())
+ xrefptr = &(xrefit->second);
+ }
+ return data.getInfo(xrefptr);
}
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 (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 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->getMasterBuffer();
- BOOST_ASSERT(tmp);
- if (tmp != buf) {
- this->fillWithBibKeys(tmp);
- return;
- }
-
- // Pre-load all child documents.
- loadChildDocuments(*buf);
-
- 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
//
-////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
namespace {
char const * const citeCommands[] = {
- "cite", "citet", "citep", "citealt", "citealp", "citeauthor",
- "citeyear", "citeyearpar" };
+ "cite", "citet", "citep", "citealt", "citealp",
+ "citeauthor", "citeyear", "citeyearpar", "nocite" };
unsigned int const nCiteCommands =
sizeof(citeCommands) / sizeof(char *);
-CiteStyle const citeStyles[] = {
- CITE, CITET, CITEP, CITEALT, CITEALP,
-CITEAUTHOR, CITEYEAR, CITEYEARPAR };
+CiteStyle const citeStylesArray[] = {
+ CITE, CITET, CITEP, CITEALT, CITEALP,
+ CITEAUTHOR, CITEYEAR, CITEYEARPAR, NOCITE };
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;
- cmd = cmd.substr(0,n);
+ 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 (std::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 (std::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);
- cite_vec::size_type i = 0;
+ 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